1.修改信息采集带疗法的药师消息业务 2.信息采集疗法过滤停用的数据

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

@@ -134,7 +134,7 @@ public class FsPrescribe extends BaseEntity
 
     /** 审核时间 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
 
     @Excel(name = "病人生日")

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

@@ -68,7 +68,7 @@ public interface FsPackageMapper
 
     @Select("select package_id dictValue,package_name dictLabel from fs_package where package_sub_type != 3 order by sort")
     List<OptionsVO> selectAllPackageList();
-    @Select("select package_id dictValue,package_name dictLabel from fs_package where is_show = 0  order by sort")
+    @Select("select package_id dictValue,package_name dictLabel from fs_package where is_show = 0 and status = 1  order by sort")
     List<OptionsVO> selectAllPrivatePackageList();
     @Select({"<script> " +
             "select * from fs_package "+

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

@@ -30,6 +30,8 @@ import com.fs.company.vo.FsStoreProductStatisticsVO;
 import com.fs.config.cloud.CloudHostProper;
 import com.fs.core.config.WxPayProperties;
 import com.fs.core.utils.OrderCodeUtils;
+import com.fs.doctor.domain.DoctorMsg;
+import com.fs.doctor.mapper.DoctorMsgMapper;
 import com.fs.erp.domain.*;
 import com.fs.erp.dto.*;
 import com.fs.erp.dto.df.*;
@@ -302,6 +304,9 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     @Autowired
     private FsUserInformationCollectionMapper userInformationCollectionMapper;
 
+    @Autowired
+    private DoctorMsgMapper doctorMsgMapper;
+
     //ERP 类型到服务的映射
     private Map<Integer, IErpOrderService> erpServiceMap;
     @PostConstruct
@@ -903,6 +908,14 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             if (prescribeId != null) {
                 redisCache.setCacheObject("collectionPrescribeId:" + prescribeId, collection);
             }
+            DoctorMsg msg = new DoctorMsg();
+            String name = collection.getUserName() != null ? collection.getUserName() : "-";
+            msg.setTitle("用户信息采集开方");
+            msg.setType(1);
+            msg.setContent("患者:" + name + "的信息采集，前往开方");
+            msg.setDoctorId(collection.getDoctorId());
+            msg.setCreateTime(DateUtils.getNowDate());
+            doctorMsgMapper.insertDoctorMsg(msg);
         }
         order.setStatus(2);
         order.setPayDelivery(packageOrder.getPayDelivery());

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

@@ -47,7 +47,7 @@ public class FsPrescribeListDVO implements Serializable {
     private Integer status;
 
     /** 审核时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date auditTime;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

fs-service/src/main/java/com/fs/hisStore/service/impl/FsUserInformationCollectionServiceImpl.java

@@ -595,7 +595,14 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         map.setUserAdvice(param.getUserAdvice());
         if (collection.getStatus() == 1) {
             //用户第一次确认添加医生消息
-            DoctorMsg msg = getDoctorMsg(collection);
+            DoctorMsg msg = new DoctorMsg();
+            String name = collection.getUserName() != null ? collection.getUserName() : "-";
+            //没套餐包的添加医生信息采集建议消息
+            msg.setTitle("用户采集信息建议");
+            msg.setType(3);
+            msg.setContent("患者:" + name + "的信息采集，前往建议");
+            msg.setDoctorId(collection.getDoctorId());
+            msg.setCreateTime(DateUtils.getNowDate());
             //插入医生消息
             doctorMsgMapper.insertDoctorMsg(msg);
             //第一次确认
@@ -629,25 +636,6 @@ public class FsUserInformationCollectionServiceImpl extends ServiceImpl<FsUserIn
         return R.error("用户确认失败");
     }
 
-    private static @NotNull DoctorMsg getDoctorMsg(FsUserInformationCollection collection) {
-        DoctorMsg msg = new DoctorMsg();
-        String name = collection.getUserName() != null ? collection.getUserName() : "-";
-        if (collection.getIsPackage() == 0) {
-            //没套餐包的添加医生信息采集建议消息
-            msg.setTitle("用户采集信息建议");
-            msg.setType(3);
-            msg.setContent("患者:" + name + "的信息采集，前往建议");
-            msg.setDoctorId(collection.getDoctorId());
-            msg.setCreateTime(DateUtils.getNowDate());
-        } else if (collection.getIsPackage() == 1) {
-            msg.setTitle("用户信息采集开方");
-            msg.setType(1);
-            msg.setContent("患者:" + name + "的信息采集，前往开方");
-            msg.setDoctorId(collection.getDoctorId());
-            msg.setCreateTime(DateUtils.getNowDate());
-        }
-        return msg;
-    }
 
     @Override
     @Transactional