Explorar el Código

修复"药食同源"bug+修复答题领红包无关联记录的问题

cgp hace 1 día
padre
commit
356451cce0

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

@@ -36,7 +36,7 @@ public class BeforePrescribeAddDoctorAdviceDTO {
     private String noteTaboos;
 
     /**
-     * 不建议使用 选中为true否则为false
+     * 不适合用药 选中为true否则为false
      * */
     private Boolean notRecommendUse;
 

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

@@ -291,7 +291,7 @@ public class FsPrescribeDataScrmServiceImpl implements IFsPrescribeDataScrmServi
         fsPrescribeDataScrm.setRecipeType(1);//医生已填写建议信息
         if (addDoctorAdviceDTO.getNotRecommendUse() != null && addDoctorAdviceDTO.getNotRecommendUse()){
             // 不适合用药
-            fsPrescribeDataScrm.setDoctorConfirm(-3);//不建议使用
+            fsPrescribeDataScrm.setDoctorConfirm(-3);//不适合用药
             fsPrescribeDataScrm.setNotPrescribeReason("不适合用药");
             // 更新客户信息表状态为不适合用药
             updateCustomerStatus(fsPrescribeDataScrm.getPrescribeId(), NOT_RECOMMEND_USE);

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

@@ -10,7 +10,7 @@ public class PrescribeScrmDoctorAdviceVO {
     private String noteTaboos;
 
     /**
-     * 不建议使用 选中为true否则为false
+     * 不适合用药 选中为true否则为false
      * */
     private Boolean notRecommendUse;
 

+ 1 - 1
fs-service/src/main/java/com/fs/qw/service/impl/FsCompanyCustomerServiceImpl.java

@@ -100,7 +100,7 @@ public class FsCompanyCustomerServiceImpl implements IFsCompanyCustomerService {
     private static final String QRC_RED_PACKAGE_CONFIG_KEY = "qrcRedPackage.config";
 
     private static final Set<Integer> ALLOWED_STATUSES =
-            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(0, 5, 6, 7))); // 允许操作完善客户信息的状态
+            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(0, 5, 6, 7,8))); // 允许完善客户信息的操作状态