看课小程序修改

fs-qw-task/src/main/java/com/fs/app/controller/CommonController.java

@@ -19,7 +19,6 @@ import com.fs.sop.mapper.QwSopLogsMapper;
 import com.fs.sop.mapper.QwSopMapper;
 import com.fs.sop.mapper.SopUserLogsMapper;
 import com.fs.sop.service.*;
-import com.fs.sop.vo.ExtCourseSopWatchLogVO;
 import com.fs.sop.vo.QwSopLogsDoSendListTVO;
 import com.fs.store.service.IFsUserCourseCountService;
 import io.swagger.annotations.Api;
@@ -130,13 +129,6 @@ public class CommonController {
         return R.ok();
     }
 
-    @GetMapping("/testSop")
-    public R testSop() throws Exception {
-
-        List<ExtCourseSopWatchLogVO> tagList = iSopUserLogsInfoService.getExtCourseSopWatchLog(14185L);
-        return R.ok().put("data",tagList);
-    }
-
     @GetMapping("/testRatingSop")
     public R testRatingSop(String sopId) throws Exception {
 

fs-service/src/main/java/com/fs/his/domain/FsPrescribe.java

@@ -4,6 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import com.vdurmont.emoji.EmojiParser;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -17,7 +19,9 @@ import java.util.Date;
  * @author fs
  * @date 2023-06-13
  */
+@EqualsAndHashCode(callSuper = true)
 @Slf4j
+@Data
 public class FsPrescribe extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -170,420 +174,10 @@ public class FsPrescribe extends BaseEntity
 
     public Integer source;
 
+    /**
+     * 用户确认0未确认 1已确认
+     */
+    private Integer userConfirm;
 
-    public String getPrescribeImgStoreUrl() {
-        return prescribeImgStoreUrl;
-    }
 
-    public void setPrescribeImgStoreUrl(String prescribeImgStoreUrl) {
-        this.prescribeImgStoreUrl = prescribeImgStoreUrl;
-    }
-
-    public Integer getSource() {
-        return source;
-    }
-
-    public void setSource(Integer source) {
-        this.source = source;
-    }
-
-    public String getIcdCode() {
-        return icdCode;
-    }
-
-    public void setIcdCode(String icdCode) {
-        this.icdCode = icdCode;
-    }
-
-    public Integer getCycle() {
-        return cycle;
-    }
-
-    public void setCycle(Integer cycle) {
-        this.cycle = cycle;
-    }
-
-    public String getPrescribeCodeUrl() {
-        return prescribeCodeUrl;
-    }
-
-    public void setPrescribeCodeUrl(String prescribeCodeUrl) {
-        this.prescribeCodeUrl = prescribeCodeUrl;
-    }
-
-    public Integer getRecipeType() {
-        return recipeType;
-    }
-
-    public void setRecipeType(Integer recipeType) {
-        this.recipeType = recipeType;
-    }
-
-    public Long getPrescribeDoctorId() {
-        return prescribeDoctorId;
-    }
-
-    public void setPrescribeDoctorId(Long prescribeDoctorId) {
-        this.prescribeDoctorId = prescribeDoctorId;
-    }
-
-    public String getDoctorSignUrl() {
-        return doctorSignUrl;
-    }
-
-    public void setDoctorSignUrl(String doctorSignUrl) {
-        this.doctorSignUrl = doctorSignUrl;
-    }
-
-    public String getPrescribeDoctorSignUrl() {
-        return prescribeDoctorSignUrl;
-    }
-
-    public void setPrescribeDoctorSignUrl(String prescribeDoctorSignUrl) {
-        this.prescribeDoctorSignUrl = prescribeDoctorSignUrl;
-    }
-
-    public String getPatientBirthday() {
-        return patientBirthday;
-    }
-
-    public void setPatientBirthday(String patientBirthday) {
-        this.patientBirthday = patientBirthday;
-    }
-
-    public String getDrugDoctorSignUrl() {
-        return drugDoctorSignUrl;
-    }
-
-    public void setDrugDoctorSignUrl(String drugDoctorSignUrl) {
-        this.drugDoctorSignUrl = drugDoctorSignUrl;
-    }
-
-
-
-    public Long getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Long storeId) {
-        this.storeId = storeId;
-    }
-
-    public String getUsageJson() {
-        return usageJson;
-    }
-
-    public void setUsageJson(String usageJson) {
-        this.usageJson = usageJson;
-    }
-
-    @Override
-    public String getRemark() {
-        return remark;
-    }
-
-    @Override
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public Long getDrugDoctorId() {
-        return drugDoctorId;
-    }
-
-    public void setDrugDoctorId(Long drugDoctorId) {
-        this.drugDoctorId = drugDoctorId;
-    }
-
-    public void setPrescribeId(Long prescribeId)
-    {
-        this.prescribeId = prescribeId;
-    }
-
-    public Long getPrescribeId()
-    {
-        return prescribeId;
-    }
-    public void setPrescribeType(Integer prescribeType)
-    {
-        this.prescribeType = prescribeType;
-    }
-
-    public Integer getPrescribeType()
-    {
-        return prescribeType;
-    }
-    public void setInquiryOrderId(Long inquiryOrderId)
-    {
-        this.inquiryOrderId = inquiryOrderId;
-    }
-
-    public Long getInquiryOrderId()
-    {
-        return inquiryOrderId;
-    }
-    public void setStoreOrderId(Long storeOrderId)
-    {
-        this.storeOrderId = storeOrderId;
-    }
-
-    public Long getStoreOrderId()
-    {
-        return storeOrderId;
-    }
-    public void setUserId(Long userId)
-    {
-        this.userId = userId;
-    }
-
-    public Long getUserId()
-    {
-        return userId;
-    }
-    public void setPatientId(Long patientId)
-    {
-        this.patientId = patientId;
-    }
-
-    public Long getPatientId()
-    {
-        return patientId;
-    }
-    public void setPrescribeCode(String prescribeCode)
-    {
-        this.prescribeCode = prescribeCode;
-    }
-
-    public String getPrescribeCode()
-    {
-        return prescribeCode;
-    }
-    public void setPatientDescs(String patientJson) {
-        try {
-            if (StringUtils.isNotEmpty(patientJson)) {
-                this.patientDescs = EmojiParser.parseToHtmlDecimal(patientJson);
-            } else {
-                this.patientDescs = patientJson;
-            }
-        } catch (Exception e) {
-            // 记录异常并使用原始值
-            log.error("处理patientDescs时发生错误: {}", patientJson, e);
-            this.patientDescs = patientJson;
-        }
-    }
-
-    public String getPatientDescs()
-    {
-        if(StringUtils.isNotEmpty(patientDescs)){
-            return EmojiParser.parseToUnicode(patientDescs);
-        }
-        else{
-            return patientDescs;
-        }
-    }
-    public void setNowIllness(String nowIllness)
-    {
-        this.nowIllness = nowIllness;
-    }
-
-    public String getNowIllness()
-    {
-        return nowIllness;
-    }
-    public void setHistoryIllness(String historyIllness)
-    {
-        this.historyIllness = historyIllness;
-    }
-
-    public String getHistoryIllness()
-    {
-        return historyIllness;
-    }
-    public void setPatientAge(String patientAge)
-    {
-        this.patientAge = patientAge;
-    }
-
-    public String getPatientAge()
-    {
-        return patientAge;
-    }
-    public void setPatientName(String patientName)
-    {
-        this.patientName = patientName;
-    }
-
-    public String getPatientName()
-    {
-        return patientName;
-    }
-    public void setWeight(String weight)
-    {
-        this.weight = weight;
-    }
-
-    public String getWeight()
-    {
-        return weight;
-    }
-    public void setIsHistoryAllergic(String isHistoryAllergic)
-    {
-        this.isHistoryAllergic = isHistoryAllergic;
-    }
-
-    public String getIsHistoryAllergic()
-    {
-        return isHistoryAllergic;
-    }
-    public void setHistoryAllergic(String historyAllergic)
-    {
-        this.historyAllergic = historyAllergic;
-    }
-
-    public String getHistoryAllergic()
-    {
-        return historyAllergic;
-    }
-    public void setLiverUnusual(String liverUnusual)
-    {
-        this.liverUnusual = liverUnusual;
-    }
-
-    public String getLiverUnusual()
-    {
-        return liverUnusual;
-    }
-    public void setRenalUnusual(String renalUnusual)
-    {
-        this.renalUnusual = renalUnusual;
-    }
-
-    public String getRenalUnusual()
-    {
-        return renalUnusual;
-    }
-    public void setIsLactation(String isLactation)
-    {
-        this.isLactation = isLactation;
-    }
-
-    public String getIsLactation()
-    {
-        return isLactation;
-    }
-    public void setPatientTel(String patientTel)
-    {
-        this.patientTel = patientTel;
-    }
-
-    public String getPatientTel()
-    {
-        return patientTel;
-    }
-    public void setPatientGender(String patientGender)
-    {
-        this.patientGender = patientGender;
-    }
-
-    public String getPatientGender()
-    {
-        return patientGender;
-    }
-    public void setRecordPic(String recordPic)
-    {
-        this.recordPic = recordPic;
-    }
-
-    public String getRecordPic()
-    {
-        return recordPic;
-    }
-    public void setPrescribeImgUrl(String prescribeImgUrl)
-    {
-        this.prescribeImgUrl = prescribeImgUrl;
-    }
-
-    public String getPrescribeImgUrl()
-    {
-        return prescribeImgUrl;
-    }
-    public void setAuditReason(String auditReason)
-    {
-        this.auditReason = auditReason;
-    }
-
-    public String getAuditReason()
-    {
-        return auditReason;
-    }
-    public void setDiagnose(String diagnose)
-    {
-        this.diagnose = diagnose;
-    }
-
-    public String getDiagnose()
-    {
-        return diagnose;
-    }
-    public void setDoctorId(Long doctorId)
-    {
-        this.doctorId = doctorId;
-    }
-
-    public Long getDoctorId()
-    {
-        return doctorId;
-    }
-    public void setStatus(Integer status)
-    {
-        this.status = status;
-    }
-
-    public Integer getStatus()
-    {
-        return status;
-    }
-    public void setAuditTime(Date auditTime)
-    {
-        this.auditTime = auditTime;
-    }
-
-    public Date getAuditTime()
-    {
-        return auditTime;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-            .append("prescribeId", getPrescribeId())
-            .append("prescribeType", getPrescribeType())
-            .append("inquiryOrderId", getInquiryOrderId())
-            .append("storeOrderId", getStoreOrderId())
-            .append("userId", getUserId())
-            .append("patientId", getPatientId())
-            .append("prescribeCode", getPrescribeCode())
-            .append("patientDescs", getPatientDescs())
-            .append("nowIllness", getNowIllness())
-            .append("historyIllness", getHistoryIllness())
-            .append("patientAge", getPatientAge())
-            .append("patientName", getPatientName())
-            .append("weight", getWeight())
-            .append("isHistoryAllergic", getIsHistoryAllergic())
-            .append("historyAllergic", getHistoryAllergic())
-            .append("liverUnusual", getLiverUnusual())
-            .append("renalUnusual", getRenalUnusual())
-            .append("isLactation", getIsLactation())
-            .append("patientTel", getPatientTel())
-            .append("patientGender", getPatientGender())
-            .append("recordPic", getRecordPic())
-            .append("prescribeImgUrl", getPrescribeImgUrl())
-            .append("auditReason", getAuditReason())
-            .append("diagnose", getDiagnose())
-            .append("doctorId", getDoctorId())
-            .append("createTime", getCreateTime())
-            .append("status", getStatus())
-            .append("auditTime", getAuditTime())
-            .toString();
-    }
 }

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -108,23 +108,7 @@ public interface FsPackageMapper
             "        order by sort,package_id desc"+
             "</script>"})
     List<FsPackageExcelVO> selectFsPackageListExcelVO(@Param("maps") FsPackage fsPackage);
-    @Select({"<script> " +
-            "select p.*  from fs_package p    " +
-            "where p.status=1 and p.is_del=0   " +
-            "<if test = 'maps.keyword != null     '> " +
-            "and ( p.package_name like CONCAT('%',#{maps.keyword},'%') or p.second_name like CONCAT('%',#{maps.keyword},'%')) " +
-            "</if>" +
-            "<if test = 'maps.diseaseType != null and maps.diseaseType !=0    '> " +
-            "and p.disease_type = #{maps.diseaseType} " +
-            "</if>" +
-            "<if test = 'maps.privateType != null'> " +
-            "and p.private_type = #{maps.privateType} " +
-            "</if>" +
-            "<if test = 'maps.isShow != null '> " +
-            "and p.is_show = #{maps.isShow} " +
-            "</if>" +
-            " order by p.sort desc,package_id  "+
-            "</script>"})
+
     List<FsPackageListUVO> selectFsPackageListUVO(@Param("maps") FsPackageListUParam param);
     @Select("select count(order_id) from fs_package_order WHERE user_id=#{userId} AND package_id=#{packageId} AND `status`>=0")
     int selectFsPackageListByUser(@Param("userId")Long userId,@Param("packageId")Long packageId);

fs-service/src/main/java/com/fs/his/param/FsPackageListUParam.java

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 @Data
 public class FsPackageListUParam  implements Serializable {
@@ -15,4 +16,8 @@ public class FsPackageListUParam  implements Serializable {
     private Integer pageNum =1;
     @ApiModelProperty(value = "页大小,默认为10")
     private Integer pageSize = 10;
+    /**
+     * 当前账号绑定的套餐包分类
+     */
+    private List<Integer> cateIds;
 }

fs-service/src/main/java/com/fs/his/service/impl/FsPackageCateServiceImpl.java

@@ -47,7 +47,6 @@ public class FsPackageCateServiceImpl implements IFsPackageCateService
      * @return 套餐包分类
      */
     @Override
-    @Cacheable(value = "getPackagCateList", key = "#param")
     public List<FsPackageCate> selectFsPackageCateList(FsPackageCateUParam param)
     {
         return fsPackageCateMapper.selectFsPackageCateList(param);

fs-service/src/main/java/com/fs/his/service/impl/FsPackageServiceImpl.java

@@ -238,7 +238,6 @@ public class FsPackageServiceImpl implements IFsPackageService {
     }
 
     @Override
-    @Cacheable(value = "getPackageList", key = "#param")
     public List<FsPackageListUVO> selectFsPackageListUVO(FsPackageListUParam param) {
         return fsPackageMapper.selectFsPackageListUVO(param);
     }

fs-service/src/main/java/com/fs/his/service/impl/FsPrescribeServiceImpl.java

@@ -31,10 +31,12 @@ import com.fs.im.service.IImService;
 import com.fs.system.oss.CloudStorageService;
 import com.fs.system.oss.OSSFactory;
 import com.google.zxing.WriterException;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.imageio.ImageIO;
@@ -379,6 +381,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
 
 //    @Async
     @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public String PrescribeImg(Long PrescribeId){
         FsPrescribeVO f = fsPrescribeMapper.selectFsPrescribeByPrescribeIdVO(PrescribeId);
         if (f==null){
@@ -894,12 +897,17 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             param.setDoctorId(id);
             param.setStatus(1);
             param.setPrescribeId(fsPrescribe.getPrescribeId());
-            audit(param);
+            IFsPrescribeService fsPrescribeService = (IFsPrescribeService) AopContext.currentProxy();
+            // 创建订单 & 发送消息
+            fsPrescribeService.audit(param);
+
+            // 生成处方单图片
+            fsPrescribeService.PrescribeImg(id);
         }
     }
 
     @Override
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public R audit(FsPrescribeAuditParam param){
         FsPrescribe prescribe=this.selectFsPrescribeByPrescribeId(param.getPrescribeId());
         if(prescribe.getStatus()!=0){

fs-service/src/main/java/com/fs/his/vo/FsPrescribeVO.java

@@ -169,4 +169,8 @@ public class FsPrescribeVO implements Serializable {
     private Date updateTime;
     private String prescribeCodeUrl;
     private String icdCode;
+    /**
+     * 用户确认0未确认 1已确认
+     */
+    private Integer userConfirm;
 }

fs-service/src/main/resources/mapper/his/FsPackageCateMapper.xml

@@ -21,6 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectFsPackageCateList" parameterType="FsPackageCate" resultMap="FsPackageCateResult">
         <include refid="selectFsPackageCateVo"/>
         <where>
+            status = 1
             <if test="cateCode != null "> and cate_code = #{cateCode}</if>
             <if test="type != null "> and type = #{type}</if>
             <if test="cateName != null  and cateName != ''"> and cate_name like concat('%', #{cateName}, '%')</if>

fs-service/src/main/resources/mapper/his/FsPackageMapper.xml

@@ -75,6 +75,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                  LEFT JOIN fs_icd i ON FIND_IN_SET(i.icd_code, p.icd_code) > 0
         WHERE package_id = #{packageId};
     </select>
+    <select id="selectFsPackageListUVO" resultType="com.fs.his.vo.FsPackageListUVO">
+        select p.*  from fs_package p
+        where p.status=1 and p.is_del=0
+        <if test = 'maps.keyword != null'>
+            and ( p.package_name like CONCAT('%',#{maps.keyword},'%') or p.second_name like CONCAT('%',#{maps.keyword},'%'))
+        </if>
+        <if test = 'maps.diseaseType != null and maps.diseaseType !=0'>
+            and p.disease_type = #{maps.diseaseType}
+        </if>
+        <if test = 'maps.privateType != null'>
+            and p.private_type = #{maps.privateType}
+        </if>
+        <if test = 'maps.isShow != null '>
+            and p.is_show = #{maps.isShow}
+        </if>
+        <if test="maps.cateIds != null and maps.cateIds.size() > 0">
+            and p.private_type in
+            <foreach collection="maps.cateIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+         order by p.sort desc,package_id
+    </select>
 
     <insert id="insertFsPackage" parameterType="FsPackage" useGeneratedKeys="true" keyProperty="packageId">
         insert into fs_package

fs-service/src/main/resources/mapper/his/FsPrescribeMapper.xml

@@ -51,7 +51,7 @@
     </resultMap>
 
     <sql id="selectFsPrescribeVo">
-        select prescribe_id,prescribe_code_url,prescribe_img_store_url,source,cycle,icd_code,prescribe_type,recipe_type,patient_birthday,drug_doctor_sign_url,prescribe_doctor_id,doctor_sign_url,prescribe_doctor_sign_url, inquiry_order_id, store_order_id, user_id, patient_id, prescribe_code, patient_descs, now_illness, history_illness, patient_age, patient_name, weight, is_history_allergic, history_allergic, liver_unusual, renal_unusual, is_lactation, patient_tel, patient_gender, record_pic, prescribe_img_url, audit_reason, diagnose, doctor_id,drug_doctor_id, create_time, status, audit_time,remark,usage_json,store_id from fs_prescribe
+        select prescribe_id,prescribe_code_url,prescribe_img_store_url,source,cycle,icd_code,prescribe_type,recipe_type,patient_birthday,drug_doctor_sign_url,prescribe_doctor_id,doctor_sign_url,prescribe_doctor_sign_url, inquiry_order_id, store_order_id, user_id, patient_id, prescribe_code, patient_descs, now_illness, history_illness, patient_age, patient_name, weight, is_history_allergic, history_allergic, liver_unusual, renal_unusual, is_lactation, patient_tel, patient_gender, record_pic, prescribe_img_url, audit_reason, diagnose, doctor_id,drug_doctor_id, create_time, status, audit_time,remark,usage_json,store_id,user_confirm from fs_prescribe
     </sql>
 
     <select id="selectFsPrescribeList" parameterType="FsPrescribe" resultMap="FsPrescribeResult">

fs-service/src/main/resources/mapper/his/FsStoreOrderMapper.xml

@@ -784,7 +784,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and cu.nick_name like concat( #{maps.companyUserNickName}, '%')
             </if>
             <if test="maps.companyId != null and  maps.companyId != -1">
-                " + "and so.company_id =#{maps.companyId} " + "
+                and so.company_id =#{maps.companyId}
             </if>
             <if test="maps.companyId == -1">
                 and so.company_id is null

fs-user-app/src/main/java/com/fs/app/controller/PackageController.java

@@ -1,6 +1,7 @@
 package com.fs.app.controller;
 
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,6 +29,7 @@ import io.jsonwebtoken.Claims;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Synchronized;
+import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -82,7 +84,7 @@ public class PackageController extends AppBaseController {
             }
             param.setCompanyUserId(companyUserId);
         } catch (Exception e) {
-            log.info("获取套餐分类:销售未登录");
+            log.error("获取套餐包分类出错! 切换为获取所有套餐包",e);
         } finally {
             List<FsPackageCate> cates = packageCateService.selectFsPackageCateList(param);
             return R.ok().put("data", cates);
@@ -93,10 +95,28 @@ public class PackageController extends AppBaseController {
     @ApiOperation("获取套餐列表")
     @GetMapping("/getPackageList")
     public R getPackageList(FsPackageListUParam param) {
+        log.info("获取套餐列表 请求参数: {}",param);
+
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
-        List<FsPackageListUVO> list = packageService.selectFsPackageListUVO(param);
-        PageInfo<FsPackageListUVO> listPageInfo = new PageInfo<>(list);
-        return R.ok().put("data", listPageInfo);
+
+        try {
+            Long companyUserId = getCompanyUserId();
+            CompanyUser companyUser = companyUserService.selectCompanyUserById(companyUserId);
+            Company company = companyService.selectCompanyById(companyUser.getCompanyId());
+            String packageCateIds = company.getPackageCateIds();
+            if (StringUtils.isNotBlank(packageCateIds)) {
+                List<Integer> cateIds = JSONArray.parseArray(packageCateIds, Integer.class);
+                if (CollectionUtils.isNotEmpty(cateIds)) {
+                    param.setCateIds(cateIds);
+                }
+            }
+        }catch (Exception e) {
+            log.error("当前可能未登录，查看所有产品",e);
+        } finally {
+            List<FsPackageListUVO> list = packageService.selectFsPackageListUVO(param);
+            PageInfo<FsPackageListUVO> listPageInfo = new PageInfo<>(list);
+            return R.ok().put("data", listPageInfo);
+        }
     }
 
     @ApiOperation("获取套餐详情")

fs-user-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -19,6 +19,8 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Synchronized;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
@@ -35,6 +37,7 @@ import java.util.Map;
 @Api("处方接口")
 @RestController
 @RequestMapping(value="/app/prescribe")
+@Slf4j
 public class PrescribeController extends  AppBaseController {
 
     @Autowired
@@ -63,10 +66,9 @@ public class PrescribeController extends  AppBaseController {
     @GetMapping("/getPrescribeById")
     public R getPrescribeById(@RequestParam("prescribeId")Long prescribeId)
     {
+        log.info("获取处方信息： 请求参数{}",prescribeId);
+
         FsPrescribe prescribe=prescribeService.selectFsPrescribeByPrescribeId(prescribeId);
-//        if(!prescribe.getUserId().equals(Long.parseLong(getUserId()))){
-//            return R.error("非法操作");
-//        }
 
         if(prescribe!=null&& StringUtils.isNotEmpty(prescribe.getPatientTel())){
             prescribe.setPatientTel(ParseUtils.parsePhone(prescribe.getPatientTel()));
@@ -82,5 +84,17 @@ public class PrescribeController extends  AppBaseController {
         return R.ok().put("data",maps);
     }
 
+    @Login
+    @PutMapping("/userConfirm")
+    public R userConfirm(@RequestParam("prescribeId")Long prescribeId){
+        log.info("用户确认处方：请求参数 {}",prescribeId);
+
+        FsPrescribe prescribe=prescribeService.selectFsPrescribeByPrescribeId(prescribeId);
+        if(ObjectUtils.equals(prescribe.getUserConfirm(),1)) {
+            throw new IllegalArgumentException("该处方已确认，请勿重复确认！");
+        }
+        prescribe.setUserConfirm(1);
+        return R.ok();
+    }
 
 }

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -82,9 +82,6 @@ public class WxUserController extends AppBaseController{
 
 
 
-    /**
-     * 登陆接口
-     */
     /**
      * 登陆接口
      */