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

@@ -1806,7 +1806,7 @@ public class FsInquiryOrderServiceImpl implements IFsInquiryOrderService
         FsInquiryOrderPatientDTO dto=new FsInquiryOrderPatientDTO();
         BeanUtils.copyProperties(patient,dto);
         // 鸿森堂的特殊判断
-        if(fsPackage.getIsHealthProductType() == 0){
+        if(fsPackage.getPackageType() != 3){
             dto.setAge(String.valueOf( DateUtil.ageOfNow(patient.getBirthday())));
             // 使用 SimpleDateFormat 格式化日期对象
             dto.setBirthday(new SimpleDateFormat("yyyy-MM-dd").format(patient.getBirthday()));

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

@@ -516,7 +516,7 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
         FsPatient patient=null;
         FsDoctor doctor=null;
         FsPackage fsPackage=fsPackageMapper.selectFsPackageByPackageId(param.getPackageId());
-        if(fsPackage.getProductType()!= null &&(fsPackage.getProductType()==1 || fsPackage.getProductType()==2) && fsPackage.getIsHealthProductType() == 0){
+        if(fsPackage.getPackageType() != 3 && fsPackage.getProductType()!= null &&(fsPackage.getProductType()==1 || fsPackage.getProductType()==2)){
             if(param.getPatientId()!=null){
                 patient=fsPatientMapper.selectFsPatientByPatientId(param.getPatientId());
                 if (patient==null){

fs-service/src/main/resources/application-druid-gzzdy.yml

@@ -37,9 +37,9 @@ spring:
         slave:
           # 从数据源开关/默认关闭
           enabled: false
-          url:
-          username:
-          password:
+          url: jdbc:mysql://172.16.16.12:3306/fs_his?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: root
+          password: ylrz14752131..!@YX
         # 初始连接数
         initialSize: 5
         # 最小连接池数量