Selaa lähdekoodia

修复信息采集处方生成图片缺失诊断与医嘱信息问题

cgp 1 päivä sitten
vanhempi
commit
4e44f48282

+ 1 - 1
fs-doctor-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -120,7 +120,7 @@ public class PrescribeController extends  AppBaseController {
         param.setDoctorId(Long.parseLong(getDoctorId()));
         if (param.getQwTag() != null && param.getQwTag() == 1 && param.getPersonalCollectStatus() != null && param.getPersonalCollectStatus().equals(PostPayPrescStatusEnum.PENDING_DRUG_DOCTOR.getCode())) {
             //个微审核逻辑
-            return prescribeService.auditAfterPaymentList(param);
+            return prescribeService.auditAfterPayment(param);
         } else if (param.getQwTag() == null || param.getQwTag() == 0) {
             //之前的审核逻辑
             return prescribeService.audit(param);

+ 1 - 1
fs-service/src/main/java/com/fs/his/service/IFsPrescribeService.java

@@ -90,7 +90,7 @@ public interface IFsPrescribeService
     /**
      * 药师审核-(后付款版本)
      * */
-    R auditAfterPaymentList(FsPrescribeAuditParam param);
+    R auditAfterPayment(FsPrescribeAuditParam param);
 
      String PrescribeImg(Long prescribeId);
      String PrescribeImgYsy(Long prescribeId);

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

@@ -1317,12 +1317,12 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
     }
 
     @Override
-    public R auditAfterPaymentList(FsPrescribeAuditParam param) {
+    public R auditAfterPayment(FsPrescribeAuditParam param) {
         FsPrescribe prescribe=this.selectFsPrescribeByPrescribeId(param.getPrescribeId());
         if(prescribe.getStatus()!=0){
             return R.error("非法操作");
         }
-        //无论审核是否通过,都删除之前只有医生签名的处方图片
+        //无论审核是否通过,都删除之前只有医生签名的处方图片,为了后续创建新的处方图片
         delUrl(param.getPrescribeId());
 
         FsPrescribe map=new FsPrescribe();
@@ -1357,7 +1357,7 @@ public class FsPrescribeServiceImpl implements IFsPrescribeService
             map.setAuditReason("");
             //重置处方单定时任务(药师审核通过后需要生成拥有药师签名的标识)
             fsExportTaskService.resetFsExportTaskByPrescribeIdAndSignFlag(param.getPrescribeId(),2);
-            //修改采集表个微状态 销售可以根据处方给客户分享套餐包进行下单了
+            //更新采集表个微状态 销售可以根据处方给客户分享套餐包进行下单了
             FsUserInformationCollection informationCollection = collectionMapper.selectFsUserInformationCollectionById(param.getCollectionId());
             informationCollection.setPersonalCollectStatus(PostPayPrescStatusEnum.PACKAGE_BIND.getCode());
             collectionMapper.updateFsUserInformationCollection(informationCollection);