开方业务

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

@@ -108,11 +108,17 @@ public interface FsPrescribeMapper
             "<if test = ' maps.type==1  '> " +
             "and p.doctor_id = #{maps.doctorId} " +
             "</if>" +
-            "<if test = ' maps.type==2 and maps.status != null and maps.status == 1  '> " +
+            "<if test = ' maps.type==2  '> " +
+            " and p.drug_doctor_id = #{maps.doctorId} " +
+            "</if>" +
+            "<if test = ' maps.type==2 and maps.status != null and maps.status == 0  '> " +
             "and p.status = 0 " +
             "</if>" +
             "<if test = ' maps.type==2 and maps.status != null and maps.status == 2  '> " +
-            "and (p.status = 1 || p.status = 2) and p.drug_doctor_id = #{maps.doctorId} " +
+            "and p.status = 2 and p.drug_doctor_id = #{maps.doctorId} " +
+            "</if>" +
+            "<if test = ' maps.type==2 and maps.status != null and maps.status == 1  '> " +
+            "and p.status = 1 and p.drug_doctor_id = #{maps.doctorId} " +
             "</if>" +
             "<if test=' maps.beginTime != null and maps.beginTime != \"\" '>" +
             "AND date_format(p.create_time,'%y%m%d') &gt;= date_format(#{maps.beginTime},'%y%m%d')  " +

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

@@ -670,11 +670,11 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
                 return R.error("请提交患者信息");
             }
             logger.info("是否是中药或者西药{},{}",fsPackage.getProductType(),fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2);
-            if (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2) {
-                if (StringUtils.isEmpty(patient.getIdCard())) {
-                    return R.error("请完善患者身份证信息");
-                }
-            }
+//            if (fsPackage.getProductType() == 1 || fsPackage.getProductType() == 2) {
+//                if (StringUtils.isEmpty(patient.getIdCard())) {
+//                    return R.error("请完善患者身份证信息");
+//                }
+//            }
 
             if(param.getDoctorId()!=null){
                 doctor=doctorMapper.selectFsDoctorByDoctorId(param.getDoctorId());

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

@@ -988,34 +988,41 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
         if(StringUtils.isNotEmpty(doctor.getSignUrl())){
             map.setDrugDoctorSignUrl(doctor.getSignUrl());
         }
-        if(param.getStatus().equals(1)){
-            this.updateFsPrescribe(map);
-            //写入订单
-            storeOrderService.createOrder(prescribe.getPrescribeId());
-            //发送信息
-            String orderId=prescribe.getInquiryOrderId().toString();
-            MsgDTO msgDTO=new MsgDTO();
-            MsgCustomDTO customDTO=new MsgCustomDTO();
-            FsInquiryOrder fsInquiryOrder = fsInquiryOrderMapper.selectFsInquiryOrderByOrderId(prescribe.getInquiryOrderId());
-            customDTO.setType("inquiry");
-            customDTO.setOrderId(orderId);
-            customDTO.setImType(1);
-            customDTO.setOrderType(fsInquiryOrder.getOrderType());
-            msgDTO.setCloudCustomData(JSONUtil.toJsonStr(customDTO));
-            msgDTO.setFrom_Account("D-"+prescribe.getDoctorId());
-            msgDTO.setTo_Account("U-"+prescribe.getUserId());
-            List<MsgDataDTO> msgs=new ArrayList<>();
-            MsgDataDTO msg=new MsgDataDTO();
-            String ext= JSONUtil.toJsonStr(prescribe);
-
-            msg.setMsgContent(new MsgDataFormatDTO("prescribe",ext,orderId));
-            msg.setMsgType("TIMCustomElem");//TIMCustomElem
-            msgs.add(msg);
-            msgDTO.setMsgBody(msgs);
-            imService.sendMsg(msgDTO);
-            return R.ok();
+        if (param.getStatus() == 1) {
+            map.setAuditReason("");
         }
-        return R.ok("操作成功");
+        if (this.updateFsPrescribe(map) > 0){
+            return R.ok("审核成功");
+        }
+
+//        if(param.getStatus().equals(1)){
+//            this.updateFsPrescribe(map);
+//            //写入订单
+//            storeOrderService.createOrder(prescribe.getPrescribeId());
+//            //发送信息
+//            String orderId=prescribe.getInquiryOrderId().toString();
+//            MsgDTO msgDTO=new MsgDTO();
+//            MsgCustomDTO customDTO=new MsgCustomDTO();
+//            FsInquiryOrder fsInquiryOrder = fsInquiryOrderMapper.selectFsInquiryOrderByOrderId(prescribe.getInquiryOrderId());
+//            customDTO.setType("inquiry");
+//            customDTO.setOrderId(orderId);
+//            customDTO.setImType(1);
+//            customDTO.setOrderType(fsInquiryOrder.getOrderType());
+//            msgDTO.setCloudCustomData(JSONUtil.toJsonStr(customDTO));
+//            msgDTO.setFrom_Account("D-"+prescribe.getDoctorId());
+//            msgDTO.setTo_Account("U-"+prescribe.getUserId());
+//            List<MsgDataDTO> msgs=new ArrayList<>();
+//            MsgDataDTO msg=new MsgDataDTO();
+//            String ext= JSONUtil.toJsonStr(prescribe);
+//
+//            msg.setMsgContent(new MsgDataFormatDTO("prescribe",ext,orderId));
+//            msg.setMsgType("TIMCustomElem");//TIMCustomElem
+//            msgs.add(msg);
+//            msgDTO.setMsgBody(msgs);
+//            imService.sendMsg(msgDTO);
+//            return R.ok();
+//        }
+        return R.error("审核失败");
 
     }
 
@@ -1043,6 +1050,8 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
     public void confirmPrescribe(FsPrescribeParam param) {
         FsPrescribe fsPrescribe = fsPrescribeMapper.selectFsPrescribeByPrescribeId(param.getPrescribeId());
         fsPrescribe.setDoctorConfirm(1);
+        //待审核
+        fsPrescribe.setStatus(0);
         fsPrescribeMapper.updateFsPrescribe(fsPrescribe);
 
         // 医生确认后生成处方单
@@ -1058,6 +1067,8 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
     public void collectionPrescribe(Long prescribeId) {
         FsPrescribe fsPrescribe = fsPrescribeMapper.selectFsPrescribeByPrescribeId(prescribeId);
         fsPrescribe.setDoctorConfirm(0);
+        //待审核
+        fsPrescribe.setStatus(0);
         fsPrescribeMapper.updateFsPrescribe(fsPrescribe);
     }
 

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -127,4 +127,8 @@ public class QwExternalContactParam {
      */
     private Integer isReply;
 
+    private Integer userRepeat;
+
+    private Long wayId;
+
 }