Dockerfile-dev

@@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar
 EXPOSE 5477
 
 # 启动应用
-ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

Dockerfile-prod

@@ -47,4 +47,4 @@ COPY --from=builder /app/sa-admin/target/*.jar app.jar
 EXPOSE 5477
 
 # 启动应用
-ENTRYPOINT ["java", "-Duser.timezone=Asia/Shanghai", "-jar", "app.jar"]
+ENTRYPOINT ["java", "-jar", "app.jar"]

sa-admin/src/main/java/net/lab1024/sa/admin/SmartAdminApplication.java

@@ -10,9 +10,6 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
-import javax.annotation.PostConstruct;
-import java.util.TimeZone;
-
 /**
  * SmartAdmin 项目启动类
  *
@@ -33,9 +30,4 @@ public class SmartAdminApplication {
     public static void main(String[] args) {
         SpringApplication.run(SmartAdminApplication.class, args);
     }
-
-    @PostConstruct
-    public void init(){
-        TimeZone.setDefault(TimeZone.getTimeZone("Asia/Shanghai"));
-    }
 }

sa-admin/src/main/java/net/lab1024/sa/admin/module/app/medicalrecord/service/MedicalRecordService.java

@@ -317,7 +317,6 @@ public class MedicalRecordService {
         medicalRecord.setSeductionReason(updateForm.getSeductionReason());
         medicalRecord.setStatus(0);
         medicalRecord.setReason("");
-        medicalRecord.setUpdateTime(LocalDateTime.now());
         medicalRecorDao.updateById(medicalRecord);
 
         // 病历-用户
@@ -333,7 +332,6 @@ public class MedicalRecordService {
         medicalRecordUser.setUid(updateForm.getUid());
         medicalRecordUser.setSex(Integer.valueOf(updateForm.getSex()));
         medicalRecordUser.setAge(updateForm.getAge());
-        medicalRecord.setUpdateTime(LocalDateTime.now());
         medicalRecorUserDao.updateById(medicalRecordUser);
 
         // 病例-病历摘要
@@ -347,7 +345,6 @@ public class MedicalRecordService {
 
         if (!Objects.equals(updateForm.getAbstractStr(), medicalRecorAbstrac.getAbstractStr())){
             medicalRecorAbstrac.setAbstractStr(updateForm.getAbstractStr());
-            medicalRecord.setUpdateTime(LocalDateTime.now());
             medicalRecorAbstracDao.updateById(medicalRecorAbstrac);
         }
 
@@ -359,7 +356,6 @@ public class MedicalRecordService {
             dp.setCaseId(medicalRecord.getId());
             dp.setTreatTime(item.getTreatTime());
             dp.setContent(item.getContent());
-            medicalRecord.setUpdateTime(LocalDateTime.now());
             int res = medicalRecorDpmasDao.insert(dp);
             if (res <= 0){
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -416,7 +412,6 @@ public class MedicalRecordService {
         medicalRecordCheckData.setBioImg(updateForm.getBioImg());
         medicalRecordCheckData.setInfImg(updateForm.getInfImg());
         medicalRecordCheckData.setCoaImg(updateForm.getCoaImg());
-        medicalRecord.setUpdateTime(LocalDateTime.now());
         medicalRecorCheckDataDao.updateById(medicalRecordCheckData);
 
         // 疾病转归
@@ -432,7 +427,6 @@ public class MedicalRecordService {
         medicalRecordPrognosis.setDay(Integer.valueOf(updateForm.getDay()));
         medicalRecordPrognosis.setDischargeStatus(Integer.valueOf(updateForm.getDischargeStatus()));
         medicalRecordPrognosis.setDischargeSituation(updateForm.getDischargeSituation());
-        medicalRecord.setUpdateTime(LocalDateTime.now());
         medicalRecorPrognosisDao.updateById(medicalRecordPrognosis);
 
         return ResponseDTO.app_ok();

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/controller/CaseplatformCaseController.java

@@ -78,7 +78,8 @@ public class CaseplatformCaseController {
     @PostMapping("/caseplatformCase/cancelExamine")
     @PreAuthorize("@saAuth.checkPermission('case-system:case:examine')")
     public ResponseDTO<String> cancelExamine(@RequestBody @Valid CancelExamineForm form) {
-        return caseplatformCaseService.cancelExamine(form);
+        caseplatformCaseService.cancelExamine(form);
+        return ResponseDTO.ok();
     }
 
 //    @ApiOperation("导出excle @author HMM")

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/entity/CaseplatformCaseEntity.java

@@ -64,12 +64,6 @@ public class CaseplatformCaseEntity {
      */
     private Integer status;
 
-
-    /**
-     * 审核不通过原因
-     */
-    private String reason;
-
     // 审核通过时间
     private LocalDateTime examineTime;
 

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/domain/vo/EasyExcelCaseDetailVO.java

@@ -28,12 +28,11 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode
 public class EasyExcelCaseDetailVO {
 
-    @ApiModelProperty(value = "病例ID")
+    @ExcelIgnore
-    @ExcelProperty("病例ID")
     private Long id;
 
     @ApiModelProperty(value = "专家姓名")
-    @ExcelProperty("专家姓名")
+    @ExcelProperty("姓名")
     private String expertName;
 
     @ApiModelProperty(value = "专家所在省份名称")
@@ -72,15 +71,8 @@ public class EasyExcelCaseDetailVO {
     @ExcelProperty(value = "病例状态", converter = CaseStatusConverter.class)
     private Integer status;
 
-    @ApiModelProperty(value = "审核通过时间")
-    @ExcelProperty("审核时间")
-    private LocalDateTime examineTime;
-
     @ApiModelProperty(value = "结算标识")
     @ExcelProperty(value = "结算状态", converter = CaseCaseSettlConverter.class)
     private Integer settlementFlag;
 
-    @ApiModelProperty(value = "结算时间")
-    @ExcelProperty("结算时间")
-    private LocalDateTime settlementTime;
 }

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseplatformcase/service/CaseplatformCaseService.java

@@ -396,7 +396,6 @@ public class CaseplatformCaseService {
 
                     // 修改病例结算状态
                     caseplatformCase.setSettlementFlag(1);
-                    caseplatformCase.setSettlementTime(LocalDateTime.now());
                     caseplatformCase.setUpdateTime(LocalDateTime.now());
                     caseplatformCaseDao.updateById(caseplatformCase);
                 }
@@ -413,7 +412,6 @@ public class CaseplatformCaseService {
      */
     public ResponseDTO<String> add(CaseplatformCaseAddForm addForm) {
         CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(addForm, CaseplatformCaseEntity.class);
-        caseplatformCaseEntity.setUpdateTime(LocalDateTime.now());
         caseplatformCaseDao.insert(caseplatformCaseEntity);
         return ResponseDTO.ok();
     }
@@ -426,7 +424,6 @@ public class CaseplatformCaseService {
      */
     public ResponseDTO<String> update(CaseplatformCaseUpdateForm updateForm) {
         CaseplatformCaseEntity caseplatformCaseEntity = SmartBeanUtil.copy(updateForm, CaseplatformCaseEntity.class);
-        caseplatformCaseEntity.setUpdateTime(LocalDateTime.now());
         caseplatformCaseDao.updateById(caseplatformCaseEntity);
         return ResponseDTO.ok();
     }
@@ -457,7 +454,6 @@ public class CaseplatformCaseService {
 
         caseplatformCase.setStatus(status);
         caseplatformCase.setExamineTime(LocalDateTime.now());
-        caseplatformCase.setUpdateTime(LocalDateTime.now());
         caseplatformCaseDao.updateById(caseplatformCase);
 
         return ResponseDTO.ok();
@@ -486,10 +482,7 @@ public class CaseplatformCaseService {
             return ResponseDTO.userErrorParam("该用户未签署协议");
         }
 
-        caseplatformCase.setSettlementFlag(1);
+        caseplatformCaseDao.settlement(case_id);
-        caseplatformCase.setSettlementTime(LocalDateTime.now());
-        caseplatformCase.setUpdateTime(LocalDateTime.now());
-        caseplatformCaseDao.updateById(caseplatformCase);
 
         return ResponseDTO.ok();
     }
@@ -498,19 +491,8 @@ public class CaseplatformCaseService {
      * 审核拒绝
      * @param form
      */
-    public ResponseDTO<String> cancelExamine(CancelExamineForm form){
+    public void cancelExamine(CancelExamineForm form){
-        // 获取病例数据
+        caseplatformCaseDao.cancelExamine(form);
-        CaseplatformCaseEntity caseplatformCase = caseplatformCaseDao.selectById(form.getCaseId());
-        if (caseplatformCase == null) {
-            return ResponseDTO.userErrorParam("病例不存在");
-        }
-
-        caseplatformCase.setStatus(2);
-        caseplatformCase.setReason(form.getReason());
-        caseplatformCase.setExamineTime(LocalDateTime.now());
-        caseplatformCase.setUpdateTime(LocalDateTime.now());
-        caseplatformCaseDao.updateById(caseplatformCase);
-        return ResponseDTO.ok();
     }
 
     public ResponseDTO<CaseplatformCaseDetailVO> getDetail(Long case_id){

sa-admin/src/main/resources/dev/application.yaml

@@ -69,4 +69,4 @@ jackson:
     fail-on-unknown-properties: false
   default-property-inclusion: always
   date-format: yyyy-MM-dd HH:mm:ss
-  time-zone: Asia/Shanghai
+  time-zone: GMT+8

sa-admin/src/main/resources/mapper/business/caseplatformcase/CaseplatformCaseMapper.xml

@@ -22,8 +22,6 @@
                 AND ( INSTR(t_caseplatform_user.uid,#{queryForm.name})
                 OR INSTR(t_caseplatform_user.name,#{queryForm.name})
                 OR INSTR(t_caseplatform_expert.name,#{queryForm.name})
-                OR INSTR(t_caseplatform_expert.hospital_name,#{queryForm.name})
-                OR INSTR(t_caseplatform_expert.mobile,#{queryForm.name})
             )
             </if>
             <!--0待审核 1审核通过 2审核不通过-->

sa-admin/src/main/resources/prod/application.yaml

@@ -61,4 +61,4 @@ jackson:
     fail-on-unknown-properties: false
   default-property-inclusion: always
   date-format: yyyy-MM-dd HH:mm:ss
-  time-zone: Asia/Shanghai
+  time-zone: GMT+8

sa-common/src/main/resources/dev/sa-common.yaml

@@ -55,7 +55,7 @@ spring:
       fail-on-unknown-properties: false
     default-property-inclusion: always
     date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: Asia/Shanghai
+    time-zone: GMT+8
 
   # 缓存实现类型
   cache:

sa-common/src/main/resources/prod/sa-common.yaml

@@ -55,7 +55,7 @@ spring:
       fail-on-unknown-properties: false
     default-property-inclusion: always
     date-format: yyyy-MM-dd HH:mm:ss
-    time-zone: Asia/Shanghai
+    time-zone: GMT+8
 
   # 缓存实现类型
   cache: