修改日期格式

postdischarge-manage/src/main/java/com/xinelu/manage/controller/patientvisitrecord/PatientVisitRecordController.java

@@ -19,9 +19,9 @@ import java.util.List;
 import java.util.Objects;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -107,7 +107,7 @@ public class PatientVisitRecordController extends BaseController {
 	@PreAuthorize("@ss.hasPermi('manage:visit:add')")
 	@Log(title = "患者就诊记录基本信息", businessType = BusinessType.INSERT)
 	@PostMapping("saveRecord")
-	public R<String> saveRecord(@Validated @RequestBody PatientVisitRecordSaveDto saveDto) {
+	public R<String> saveRecord(@Valid @RequestBody PatientVisitRecordSaveDto saveDto) {
 		patientVisitRecordService.saveRecord(saveDto);
 		return R.ok();
 	}
@@ -116,10 +116,11 @@ public class PatientVisitRecordController extends BaseController {
 	/**
      * 修改患者就诊记录基本信息
      */
+	@ApiOperation("修改患者就诊记录基本信息")
     @PreAuthorize("@ss.hasPermi('manage:visit:edit')")
     @Log(title = "患者就诊记录基本信息", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody PatientVisitRecordSaveDto patientVisitRecord) {
+    public AjaxResult edit(@Valid @RequestBody PatientVisitRecordSaveDto patientVisitRecord) {
         return toAjax(patientVisitRecordService.updatePatientVisitRecord(patientVisitRecord));
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/controller/servicepackage/ServicePackageController.java

@@ -3,6 +3,7 @@ package com.xinelu.manage.controller.servicepackage;
 import com.xinelu.common.annotation.Log;
 import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.core.domain.R;
 import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.utils.poi.ExcelUtil;
@@ -12,12 +13,18 @@ import com.xinelu.manage.service.servicepackage.IServicePackageService;
 import com.xinelu.manage.vo.servicepackage.ServicePackageVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
+import java.util.List;
-import org.springframework.web.bind.annotation.*;
-
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 服务包基础信息Controller
@@ -35,13 +42,23 @@ public class ServicePackageController extends BaseController {
     /**
      * 查询服务包基础信息列表
      */
-    @ApiOperation("查询服务包基础信息列表")
+    @ApiOperation("分页查询服务包基础信息列表")
     @PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
     @GetMapping("/list")
     public TableDataInfo list(ServicePackage servicePackage) {
         return servicePackageService.selectServicePackageList(servicePackage);
     }
 
+	/**
+	 * 查询服务包基础信息列表
+	 */
+	@ApiOperation("查询服务包基础信息列表")
+	@PreAuthorize("@ss.hasPermi('manage:servicepackage:list')")
+	@GetMapping("/getList")
+	public R<List<ServicePackageVO>> getList(ServicePackage servicePackage) {
+		return R.ok(servicePackageService.selectList(servicePackage));
+	}
+
     /**
      * 导出服务包基础信息列表
      */
@@ -66,6 +83,16 @@ public class ServicePackageController extends BaseController {
         return AjaxResult.success(servicePackageService.selectServicePackageById(id));
     }
 
+	/**
+	 * 获取服务包基础信息
+	 */
+	@ApiOperation("获取服务包基础信息")
+	@PreAuthorize("@ss.hasPermi('manage:servicepackage:query')")
+	@GetMapping(value = "/getById/{id}")
+	public R<ServicePackageVO> getById(@PathVariable("id") Long id) {
+		return R.ok(servicePackageService.getById(id));
+	}
+
     /**
      * 新增服务包基础信息
      */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientinfo/PatientInfo.java

@@ -5,9 +5,8 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
+import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.Date;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -48,7 +47,7 @@ public class PatientInfo extends BaseEntity {
     /** 出生日期，格式：yyyy-MM-dd */
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /** 身份证号 */
     @ApiModelProperty(value = "身份证号")
@@ -164,11 +163,11 @@ public class PatientInfo extends BaseEntity {
 
     /** 入院时间，时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "入院时间")
-    private Date admissionDate;
+    private LocalDate admissionDate;
 
     /** 出院时间（出院患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "出院时间（出院患者）")
-    private Date dischargeDate;
+    private LocalDate dischargeDate;
 
     /** 病历内容 */
     @ApiModelProperty(value = "病历内容")
@@ -184,11 +183,11 @@ public class PatientInfo extends BaseEntity {
 
     /** 登记日期（预住院患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "登记日期（预住院患者），时间格式：yyyy-MM-dd")
-    private Date registrationDate;
+    private LocalDate registrationDate;
 
     /** 预约时间（预住院患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "预约时间（预住院患者），时间格式：yyyy-MM-dd")
-    private Date appointmentDate;
+    private LocalDate appointmentDate;
 
     /** 门诊号（门诊患者） */
     @ApiModelProperty(value = "门诊号")
@@ -198,7 +197,7 @@ public class PatientInfo extends BaseEntity {
     /** 就诊时间（门诊患者），时间格式：yyyy-MM-dd */
     @ApiModelProperty(value = "就诊时间")
     @Excel(name = "就诊时间", readConverterExp = "门=诊患者")
-    private Date visitTime;
+    private LocalDate visitTime;
 
     /** 出院方式（出院患者） */
     @ApiModelProperty(value = "出院方式")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientprehospitalization/PatientPreHospitalization.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.domain.patientprehospitalization;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -48,7 +48,7 @@ public class PatientPreHospitalization extends BaseEntity {
     * 出生日期，格式：yyyy-MM-dd
     */
     @ApiModelProperty("出生日期，格式：yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
     /**
     * 家属电话
     */
@@ -118,12 +118,12 @@ public class PatientPreHospitalization extends BaseEntity {
     * 登记日期（预住院患者），时间格式：yyyy-MM-dd
     */
     @ApiModelProperty("登记日期（预住院患者），时间格式：yyyy-MM-dd")
-    private Date registrationDate;
+    private LocalDate registrationDate;
     /**
     * 预约时间（预住院患者），时间格式：yyyy-MM-dd
     */
     @ApiModelProperty("预约时间（预住院患者），时间格式：yyyy-MM-dd")
-    private Date appointmentDate;
+    private LocalDate appointmentDate;
     /**
     * 开证医生id
     */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitinhospital/PatientVisitInHospital.java

@@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -82,7 +82,7 @@ public class PatientVisitInHospital extends BaseEntity {
     @ApiModelProperty(value = "签名日期，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "签名日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date signatureDate;
+    private LocalDateTime signatureDate;
 
     /** 体格检查 */
     @ApiModelProperty(value = "体格检查")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitoperation/PatientVisitOperation.java

@@ -5,7 +5,7 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -42,7 +42,7 @@ public class PatientVisitOperation extends BaseEntity {
     @ApiModelProperty(value = "手术日期，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "手术日期，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date operationDate;
+    private LocalDateTime operationDate;
 
     /** 手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA */
     @ApiModelProperty(value = "手术麻醉方式，全身麻醉：GENERAL_ANESTHESIA，局部麻醉：LOCAL_ANESTHESIA")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientvisitrecord/PatientVisitRecord.java

@@ -5,7 +5,8 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -67,7 +68,7 @@ public class PatientVisitRecord extends BaseEntity {
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "出生日期，格式：yyyy-MM-dd", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /** 年龄 */
     @ApiModelProperty(value = "年龄")
@@ -88,7 +89,7 @@ public class PatientVisitRecord extends BaseEntity {
     @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "就诊时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date visitDate;
+    private LocalDateTime visitDate;
 
     /** 就诊名称 */
     @ApiModelProperty(value = "就诊名称")
@@ -162,20 +163,20 @@ public class PatientVisitRecord extends BaseEntity {
 
     /** 入院时间 */
     @ApiModelProperty(value = "入院时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "入院时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date admissionTime;
+    private LocalDateTime admissionTime;
 
     /** 出院时间 */
     @ApiModelProperty(value = "出院时间")
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "出院时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date dischargeTime;
+    private LocalDateTime dischargeTime;
 
     /** _记录时间（入院记录） */
     @ApiModelProperty(value = "_记录时间")
     @Excel(name = "_记录时间", readConverterExp = "入=院记录")
-    private Date recordTime;
+    private LocalDateTime recordTime;
 
     /** 门诊记录信息（就诊记录-门诊记录） */
     @ApiModelProperty(value = "门诊记录信息")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectbatch/ProjectBatch.java

@@ -3,7 +3,8 @@ package com.xinelu.manage.domain.projectbatch;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -38,7 +39,7 @@ public class ProjectBatch extends BaseEntity {
     * 出生日期，格式：yyyy-MM-dd
     */
     @ApiModelProperty("出生日期，格式：yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
     /**
     * 身份证号
     */
@@ -73,7 +74,7 @@ public class ProjectBatch extends BaseEntity {
     * 批次创建时间，格式：yyyy-MM-dd HH:mm:ss
     */
     @ApiModelProperty("批次创建时间，格式：yyyy-MM-dd HH:mm:ss")
-    private Date batchDate;
+    private LocalDateTime batchDate;
     /**
     * 删除标识，0：否，1：是
     */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectlastresult/ProjectLastResult.java

@@ -5,7 +5,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -115,7 +115,7 @@ public class ProjectLastResult extends BaseEntity {
     * 检测时间
     */
     @ApiModelProperty("检测时间")
-    private Date measureTime;
+    private LocalDateTime measureTime;
     /**
     * 检测人姓名，自动上传时为空，手动上传为上传人姓名
     */

postdischarge-manage/src/main/java/com/xinelu/manage/domain/projectresult/ProjectResult.java

@@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -124,7 +124,7 @@ private static final long serialVersionUID=1L;
     @ApiModelProperty(value = "检测时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "检测时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date measureTime;
+    private LocalDateTime measureTime;
 
     /** 检测人姓名，自动上传时为空，手动上传为上传人姓名 */
     @ApiModelProperty(value = "检测人姓名，自动上传时为空，手动上传为上传人姓名")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java

@@ -5,7 +5,8 @@ import com.xinelu.common.annotation.Excel;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -72,7 +73,7 @@ public class SignPatientManageRouteNode extends BaseEntity {
     @ApiModelProperty(value = "执行时间，格式：HH:mm")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "执行时间，格式：HH:mm", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date executeTime;
+    private LocalTime executeTime;
 
     /** 电话推送标识，0：未开启，1：已开启 */
     @ApiModelProperty(value = "电话推送标识，0：未开启，1：已开启")
@@ -268,7 +269,7 @@ public class SignPatientManageRouteNode extends BaseEntity {
     @ApiModelProperty(value = "节点审核时间")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "节点审核时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date routeCheckDate;
+    private LocalDateTime routeCheckDate;
 
     /** 节点审核备注信息，存储审核备注信息以及审核不通过原因等信息 */
     @ApiModelProperty(value = "节点审核备注信息，存储审核备注信息以及审核不通过原因等信息")

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientpackage/SignPatientPackage.java

@@ -6,7 +6,7 @@ import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -64,13 +64,13 @@ public class SignPatientPackage extends BaseEntity {
     @ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date serviceStartTime;
+    private LocalDateTime serviceStartTime;
 
     /** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */
     @ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date serviceEndTime;
+    private LocalDateTime serviceEndTime;
 
 	/**
 	 * 服务包期限

postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientrecord/SignPatientRecord.java

@@ -4,15 +4,14 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-
 /**
  * 患者签约记录表
  *
@@ -67,7 +66,7 @@ public class SignPatientRecord extends BaseEntity {
      */
     @ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date birthDate;
+    private LocalDate birthDate;
 
     /**
      * 签约时间，格式：yyyy-MM-dd HH:mm:ss
@@ -173,7 +172,7 @@ public class SignPatientRecord extends BaseEntity {
      * 加入意向时间（意向签约）
      */
     @ApiModelProperty(value = "加入意向时间（意向签约）")
-    private Date intentionalTime;
+    private LocalDateTime intentionalTime;
 
     /**
      * 开单医生id（意向签约）
@@ -191,7 +190,7 @@ public class SignPatientRecord extends BaseEntity {
      * 提交时间（待续签）
      */
     @ApiModelProperty(value = "提交时间（待续签）")
-    private Date submissionTime;
+    private LocalDateTime submissionTime;
     /**
      * 金额
      */

postdischarge-manage/src/main/java/com/xinelu/manage/dto/materialsinfo/MaterialsInfoDto.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -18,11 +18,11 @@ public class MaterialsInfoDto {
 
 	@ApiModelProperty(value = "创建时间开始，yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeStart;
+	private LocalDate createTimeStart;
 
 	@ApiModelProperty(value = "创建时间结束，yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeEnd;
+	private LocalDate createTimeEnd;
 
 	/** 素材状态，已上架：LISTED，未上架：NOT_LISTED */
 	@ApiModelProperty(value = "素材状态,已上架：LISTED，未上架：NOT_LISTED")

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientinfo/PatientInfoDto.java

@@ -2,6 +2,7 @@ package com.xinelu.manage.dto.patientinfo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDate;
 import java.util.Date;
 import lombok.Data;
 
@@ -64,27 +65,27 @@ public class PatientInfoDto {
 
 	/** 就诊时间开始（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间开始")
-	private Date visitTimeStart;
+	private LocalDate visitTimeStart;
 
 	/** 就诊时间结束（门诊患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "就诊时间结束")
-	private Date visitTimeEnd;
+	private LocalDate visitTimeEnd;
 
 	/** 入院时间开始，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间开始")
-	private Date admissionDateStart;
+	private LocalDate admissionDateStart;
 
 	/** 入院时间结束，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间结束")
-	private Date admissionDateEnd;
+	private LocalDate admissionDateEnd;
 
 	/** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "预约时间开始（预住院患者），时间格式：yyyy-MM-dd")
-	private Date appointmentDateStart;
+	private LocalDate appointmentDateStart;
 
 	/** 预约时间开始（预住院患者），时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "预约时间结束（预住院患者），时间格式：yyyy-MM-dd")
-	private Date appointmentDateEnd;
+	private LocalDate appointmentDateEnd;
 
 	/** 预约治疗组（取值以及枚举未知？） */
 	@ApiModelProperty(value = "预约治疗组（取值以及枚举未知？）")

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordDto.java

@@ -2,7 +2,7 @@ package com.xinelu.manage.dto.patientvisitrecord;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -28,9 +28,9 @@ public class PatientVisitRecordDto {
 
 	@ApiModelProperty(value = "就诊时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date visitDateStart;
+	private LocalDate visitDateStart;
 
 	@ApiModelProperty(value = "就诊时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date visitDateEnd;
+	private LocalDate visitDateEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordImportDto.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -35,7 +35,12 @@ public class PatientVisitRecordImportDto {
 	/** 入院时间，时间格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "入院时间")
 	@Excel(name = "入院时间")
-	private Date admissionDate;
+	private LocalDate admissionDate;
+
+	/** 出院时间 */
+	@ApiModelProperty(value = "出院时间")
+	@Excel(name = "出院时间")
+	private LocalDate dischargeTime;
 
 	/** 身份证号 */
 	@ApiModelProperty(value = "身份证号")
@@ -46,7 +51,7 @@ public class PatientVisitRecordImportDto {
 	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Excel(name = "出生日期")
-	private Date birthDate;
+	private LocalDate birthDate;
 
 	/** 性别，男：MALE，女：FEMALE */
 

postdischarge-manage/src/main/java/com/xinelu/manage/dto/patientvisitrecord/PatientVisitRecordSaveDto.java

@@ -4,8 +4,8 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import lombok.Data;
 
 /**
@@ -17,31 +17,35 @@ import lombok.Data;
 @Data
 public class PatientVisitRecordSaveDto {
 
+	/** 就诊信息表id */
+	@ApiModelProperty(value = "就诊信息表id")
+	private Long id;
+
 	/** 患者表id */
 	@ApiModelProperty(value = "患者表id")
-	@NotBlank(message = "患者数据不能为空")
+	@NotNull(message = "患者数据不能为空")
 	private Long patientId;
 
 	/**
 	 * 就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED
 	 */
 	@ApiModelProperty(value = "就诊类型，门诊：OUTPATIENT_SERVICE，住院：BE_HOSPITALIZED")
-	@NotBlank(message = "就诊类型不能为空")
+	@NotNull(message = "就诊类型不能为空")
 	private String visitType;
 
 	/** 主要诊断 */
 	@ApiModelProperty(value = "主要诊断")
-	@NotBlank(message = "主要诊断不能为空")
+	@NotNull(message = "主要诊断不能为空")
 	private String mainDiagnosis;
 
 	/** 就诊流水号 */
 	@ApiModelProperty(value = "就诊流水号")
-	@NotBlank(message = "就诊流水号不能为空")
+	@NotNull(message = "就诊流水号不能为空")
 	private String visitSerialNumber;
 
 	/** 主治医生id */
 	@ApiModelProperty(value = "主治医生id")
-	@NotBlank(message = "主治医生不能为空")
+	@NotNull(message = "主治医生不能为空")
 	private Long attendingPhysicianId;
 
 	/** 主治医生姓名 */
@@ -69,7 +73,7 @@ public class PatientVisitRecordSaveDto {
 	private String campusAgencyName;
 
 	/** 所属科室id */
-	@NotBlank(message = "科室不能为空")
+	@NotNull(message = "科室不能为空")
 	@ApiModelProperty(value = "所属科室id")
 	private Long departmentId;
 
@@ -77,34 +81,43 @@ public class PatientVisitRecordSaveDto {
 	@ApiModelProperty(value = "所属科室名称")
 	private String departmentName;
 
+	/** 所属病区id */
+	@ApiModelProperty(value = "所属病区id")
+	@Excel(name = "所属病区id")
+	private Long wardId;
+
+	/** 所属病区名称 */
+	@ApiModelProperty(value = "所属病区名称")
+	@Excel(name = "所属病区名称")
+	private String wardName;
+
 	/** 入院时间 */
 	@ApiModelProperty(value = "入院时间")
-	@NotBlank(message = "入院时间不能为空")
+	@NotNull(message = "入院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date admissionTime;
+	private LocalDateTime admissionTime;
 
 	/** 出院时间 */
 	@ApiModelProperty(value = "出院时间")
-	@NotBlank(message = "出院时间不能为空")
+	@NotNull(message = "出院时间不能为空")
-	@JsonFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date dischargeTime;
+	private LocalDateTime dischargeTime;
 
 	@ApiModelProperty(value = "住院/门诊号")
 	private String inHospitalNumber;
 
 	/** 入院病历信息，存储患者入院的整个病历信息 */
 	@ApiModelProperty(value = "入院病历信息，存储患者入院的整个病历信息")
-	@NotBlank(message = "入院病历不能为空")
+	@NotNull(message = "入院病历不能为空")
 	private String inHospitalInfo;
 
 	/** 出院病历信息，存储患者出院的整个病历信息 */
 	@ApiModelProperty(value = "出院病历信息，存储患者出院的整个病历信息")
-	@NotBlank(message = "出院病历不能为空")
 	private String outHospitalInfo;
 
-	/** 门诊记录信息（就诊记录-门诊记录） */
+	/** 手术名称 */
-	@ApiModelProperty(value = "门诊记录信息")
+	@ApiModelProperty(value = "手术名称")
-	@NotBlank(message = "门诊记录信息不能为空")
+	@Excel(name = "手术名称")
-	private String outpatientVisitInfo;
+	private String surgicalName;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectrecord/ProjectRecordDto.java

@@ -2,7 +2,7 @@ package com.xinelu.manage.dto.projectrecord;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -30,11 +30,11 @@ public class ProjectRecordDto {
 	 * 检测时间
 	 */
 	@ApiModelProperty("检测时间开始")
-	private Date measureTimeStart;
+	private LocalDate measureTimeStart;
 
 	/**
 	 * 检测时间
 	 */
 	@ApiModelProperty("检测时间结束")
-	private Date measureTimeEnd;
+	private LocalDate measureTimeEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/projectresult/ProjectResultStatisticDto.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.dto.projectresult;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -46,13 +46,13 @@ public class ProjectResultStatisticDto {
 	 */
 	@ApiModelProperty("检测时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date measureTimeStart;
+	private LocalDate measureTimeStart;
 
 	/**
 	 * 检测时间结束
 	 */
 	@ApiModelProperty("检测时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date measureTimeEnd;
+	private LocalDate measureTimeEnd;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/propagandainfo/PropagandaInfoDto.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -56,12 +56,12 @@ public class PropagandaInfoDto {
 	 */
 	@ApiModelProperty(value = "创建时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeStart;
+	private LocalDate createTimeStart;
 
 	/**
 	 * 创建时间
 	 */
 	@ApiModelProperty(value = "创建时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date createTimeEnd;
+	private LocalDate createTimeEnd;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientpackage/SignPatientPackageSaveDto.java

@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
 import javax.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -39,13 +39,13 @@ public class SignPatientPackageSaveDto {
 	@ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@NotNull(message = "服务开始时间不能为空！")
-	private Date serviceStartTime;
+	private LocalDate serviceStartTime;
 
 	/** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */
 	@ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd")
 	@NotNull(message = "服务结束时间不能为空！")
-	private Date serviceEndTime;
+	private LocalDate serviceEndTime;
 
 	/**
 	 * 服务包周期

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientAddDto.java

@@ -34,6 +34,9 @@ public class SignPatientAddDto {
 	@NotNull(message = "请选择管理路径")
 	private Long routeId;
 
+	@ApiModelProperty("管理路径名称")
+	private String routeName;
+
 	private List<SignPatientPackageHardware> devices;
 
 	private List<SignPatientInformed> informeds;

postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientrecord/SignPatientListDto.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.dto.signpatientrecord;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDate;
 import lombok.Data;
 
 /**
@@ -42,13 +42,13 @@ public class SignPatientListDto {
 	 * 加入意向时间（意向签约）
 	 */
 	@ApiModelProperty(value = "加入意向时间开始（意向签约）")
-	private Date intentionalTimeStart;
+	private LocalDate intentionalTimeStart;
 
 	/**
 	 * 加入意向时间（意向签约）
 	 */
 	@ApiModelProperty(value = "加入意向时间结束（意向签约）")
-	private Date intentionalTimeEnd;
+	private LocalDate intentionalTimeEnd;
 
 	/**
 	 * 意向来源（意向签约，字典枚举）
@@ -60,10 +60,10 @@ public class SignPatientListDto {
 	 * 签约时间，格式：yyyy-MM-dd
 	 */
 	@ApiModelProperty(value = "签约时间开始，格式：yyyy-MM-dd")
-	private Date signTimeStart;
+	private LocalDate signTimeStart;
 
 	@ApiModelProperty(value = "签约时间结束，格式：yyyy-MM-dd")
-	private Date signTimeEnd;
+	private LocalDate signTimeEnd;
 	/**
 	 * 签约时所属医院id
 	 */
@@ -102,10 +102,10 @@ public class SignPatientListDto {
 
 	@ApiModelProperty(value = "服务结束时间开始")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceEndTimeStart;
+	private LocalDate serviceEndTimeStart;
 
 	@ApiModelProperty(value = "服务结束时间结束")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceEndTimeEnd;
+	private LocalDate serviceEndTimeEnd;
 
 }

postdischarge-manage/src/main/java/com/xinelu/manage/service/patientvisitrecord/impl/PatientVisitRecordServiceImpl.java

@@ -22,9 +22,7 @@ import com.xinelu.manage.mapper.department.DepartmentMapper;
 import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
 import com.xinelu.manage.mapper.patientvisitrecord.PatientVisitRecordMapper;
 import com.xinelu.manage.service.patientvisitrecord.IPatientVisitRecordService;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
@@ -99,12 +97,22 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
         patientVisitRecord.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
         patientVisitRecord.setCreateTime(LocalDateTime.now());
         // 住院时间，出院时间-入院时间
-        LocalDate admissionTime = saveDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        long daysBetween = ChronoUnit.DAYS.between(saveDto.getAdmissionTime(), saveDto.getDischargeTime());
-        LocalDate dischargeTime = saveDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime);
         patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
-        patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
+		if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, saveDto.getVisitType())) {
-        return 0;
+			patientVisitRecord.setVisitDate(saveDto.getDischargeTime());
+		} else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, saveDto.getVisitType())) {
+			patientVisitRecord.setVisitDate(saveDto.getAdmissionTime());
+		}
+		int flag = patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
+		if (flag > 0) {
+			// 修改患者信息
+			patientInfo.setVisitMethod(saveDto.getVisitType());
+			patientInfo.setDepartmentId(saveDto.getDepartmentId());
+			patientInfo.setDepartmentName(saveDto.getDepartmentName());
+			patientMapper.updatePatientInfo(patientInfo);
+		}
+	    return flag;
     }
 
     /**
@@ -115,17 +123,32 @@ public class PatientVisitRecordServiceImpl implements IPatientVisitRecordService
      */
     @Override
     public int updatePatientVisitRecord(PatientVisitRecordSaveDto updDto) {
+		if (updDto.getId() == null) {
+			throw new ServiceException("数据传输错误");
+		}
         PatientVisitRecord patientVisitRecord = new PatientVisitRecord();
         BeanUtils.copyBeanProp(patientVisitRecord, updDto);
         patientVisitRecord.setUpdateBy(SecurityUtils.getLoginUser().getUser().getNickName());
         patientVisitRecord.setUpdateTime(LocalDateTime.now());
         // 住院时间，出院时间-入院时间
-        LocalDate admissionTime = updDto.getAdmissionTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+        long daysBetween = ChronoUnit.DAYS.between(updDto.getAdmissionTime(), updDto.getDischargeTime());
-        LocalDate dischargeTime = updDto.getDischargeTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-        long daysBetween = ChronoUnit.DAYS.between(admissionTime, dischargeTime);
         patientVisitRecord.setHospitalizationDays((int) daysBetween + 1);
-        patientVisitRecordMapper.insertPatientVisitRecord(patientVisitRecord);
+	    if (StringUtils.equals(VisitTypeConstants.OUTPATIENT_SERVICE, updDto.getVisitType())) {
-        return patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord);
+		    patientVisitRecord.setVisitDate(updDto.getDischargeTime());
+	    } else if (StringUtils.equals(VisitTypeConstants.BE_HOSPITALIZED, updDto.getVisitType())) {
+		    patientVisitRecord.setVisitDate(updDto.getAdmissionTime());
+	    }
+		int flag = patientVisitRecordMapper.updatePatientVisitRecord(patientVisitRecord);
+	    if (flag > 0) {
+		    // 查询患者信息
+		    PatientInfo patientInfo = patientMapper.selectPatientInfoById(updDto.getPatientId());
+		    // 修改患者信息
+		    patientInfo.setVisitMethod(updDto.getVisitType());
+		    patientInfo.setDepartmentId(updDto.getDepartmentId());
+		    patientInfo.setDepartmentName(updDto.getDepartmentName());
+		    patientMapper.updatePatientInfo(patientInfo);
+	    }
+        return flag;
     }
 
     /**

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/IServicePackageService.java

@@ -4,6 +4,8 @@ import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.manage.domain.servicepackage.ServicePackage;
 import com.xinelu.manage.dto.servicepackage.ServicePackageAddDTO;
 import com.xinelu.manage.vo.servicepackage.ServicePackageDetailVO;
+import com.xinelu.manage.vo.servicepackage.ServicePackageVO;
+import java.util.List;
 
 /**
  * 服务包基础信息Service接口
@@ -20,6 +22,8 @@ public interface IServicePackageService {
      */
     public ServicePackageDetailVO selectServicePackageById(Long id);
 
+	ServicePackageVO getById(Long id);
+
     /**
      * 查询服务包基础信息列表
      *
@@ -28,6 +32,14 @@ public interface IServicePackageService {
      */
     public TableDataInfo selectServicePackageList(ServicePackage servicePackage);
 
+	/**
+	 * 查询服务包基础信息列表
+	 *
+	 * @param servicePackage 服务包基础信息
+	 * @return 服务包基础信息集合
+	 */
+	List<ServicePackageVO> selectList(ServicePackage servicePackage);
+
     /**
      * 新增服务包基础信息
      *

postdischarge-manage/src/main/java/com/xinelu/manage/service/servicepackage/impl/ServicePackageServiceImpl.java

@@ -16,6 +16,7 @@ import com.xinelu.manage.service.servicepackage.IServicePackageService;
 import com.xinelu.manage.vo.servicepackage.ServicePackageDetailVO;
 import com.xinelu.manage.vo.servicepackage.ServicePackageVO;
 import com.xinelu.manage.vo.servicepackagecontent.ServicePackageContentVO;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -60,7 +61,23 @@ public class ServicePackageServiceImpl implements IServicePackageService {
         return servicePackageDetailVO;
     }
 
-    /**
+	/**
+	 * 查询服务包基础信息
+	 *
+	 * @param id 服务包基础信息主键
+	 * @return 服务包基础信息
+	 */
+	@Override public ServicePackageVO getById(Long id) {
+		ServicePackageDetailVO servicePackageDetailVo = servicePackageMapper.selectServicePackagesById(id);
+		if (ObjectUtils.isEmpty(servicePackageDetailVo)) {
+			throw new ServiceException("数据传输错误");
+		}
+		ServicePackageVO servicePackageVO = new ServicePackageVO();
+		BeanUtils.copyBeanProp(servicePackageVO, servicePackageDetailVo);
+		return servicePackageVO;
+	}
+
+	/**
      * 查询服务包基础信息列表
      *
      * @param servicePackage 服务包基础信息
@@ -78,7 +95,11 @@ public class ServicePackageServiceImpl implements IServicePackageService {
         return pageServiceUtil.getDataTable(voList);
     }
 
-    /**
+	@Override public List<ServicePackageVO> selectList(ServicePackage servicePackage) {
+		return servicePackageMapper.selectServicePackageLists(servicePackage);
+	}
+
+	/**
      * 新增服务包基础信息
      *
      * @param servicePackageAddDTO 服务包基础信息

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java

@@ -1,9 +1,9 @@
 package com.xinelu.manage.service.signpatientmanageroute.impl;
 
-import com.xinelu.common.utils.DateUtils;
 import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
 import com.xinelu.manage.mapper.signpatientmanageroute.SignPatientManageRouteMapper;
 import com.xinelu.manage.service.signpatientmanageroute.ISignPatientManageRouteService;
+import java.time.LocalDateTime;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -49,7 +49,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      */
     @Override
     public int insertSignPatientManageRoute(SignPatientManageRoute signPatientManageRoute) {
-                signPatientManageRoute.setCreateTime(DateUtils.getNowDate());
+                signPatientManageRoute.setCreateTime(LocalDateTime.now());
             return signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute);
     }
 
@@ -61,7 +61,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      */
     @Override
     public int updateSignPatientManageRoute(SignPatientManageRoute signPatientManageRoute) {
-                signPatientManageRoute.setUpdateTime(DateUtils.getNowDate());
+                signPatientManageRoute.setUpdateTime(LocalDateTime.now());
         return signPatientManageRouteMapper.updateSignPatientManageRoute(signPatientManageRoute);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java

@@ -1,9 +1,9 @@
 package com.xinelu.manage.service.signpatientmanageroutenode.impl;
 
-import com.xinelu.common.utils.DateUtils;
 import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
 import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
 import com.xinelu.manage.service.signpatientmanageroutenode.ISignPatientManageRouteNodeService;
+import java.time.LocalDateTime;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -49,7 +49,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
      */
     @Override
     public int insertSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) {
-                signPatientManageRouteNode.setCreateTime(DateUtils.getNowDate());
+                signPatientManageRouteNode.setCreateTime(LocalDateTime.now());
             return signPatientManageRouteNodeMapper.insertSignPatientManageRouteNode(signPatientManageRouteNode);
     }
 
@@ -61,7 +61,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
      */
     @Override
     public int updateSignPatientManageRouteNode(SignPatientManageRouteNode signPatientManageRouteNode) {
-                signPatientManageRouteNode.setUpdateTime(DateUtils.getNowDate());
+                signPatientManageRouteNode.setUpdateTime(LocalDateTime.now());
         return signPatientManageRouteNodeMapper.updateSignPatientManageRouteNode(signPatientManageRouteNode);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientrecord/impl/SignPatientRecordServiceImpl.java

@@ -1,6 +1,5 @@
 package com.xinelu.manage.service.signpatientrecord.impl;
 
-import com.xinelu.common.constant.PaymentStatusConstants;
 import com.xinelu.common.constant.SignRecordServiceStatusConstants;
 import com.xinelu.common.constant.TaskCreateTypeConstant;
 import com.xinelu.common.exception.ServiceException;
@@ -8,7 +7,6 @@ import com.xinelu.common.utils.SecurityUtils;
 import com.xinelu.common.utils.StringUtils;
 import com.xinelu.common.utils.bean.BeanUtils;
 import com.xinelu.manage.domain.patientinfo.PatientInfo;
-import com.xinelu.manage.domain.servicepackage.ServicePackage;
 import com.xinelu.manage.domain.signpatientinformed.SignPatientInformed;
 import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute;
 import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
@@ -120,7 +118,7 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 			}
 			signPatientRecord.setServiceStatus(SignRecordServiceStatusConstants.SERVICE_CENTER);
 			signPatientRecord.setDelFlag(0);
-			signPatientRecord.setPaymentStatus(PaymentStatusConstants.UNPAID_FEES);
+			signPatientRecord.setPaymentStatus(signPatientPackageDto.getPackagePaymentStatus());
 			signPatientRecord.setSignTime(LocalDateTime.now());
 			signPatientRecord.setSignStatus(SignRecordServiceStatusConstants.IN_SIGN);
 			signPatientRecord.setPrice(signPatientPackageDto.getPackagePrice());
@@ -137,18 +135,16 @@ public class SignPatientRecordServiceImpl implements ISignPatientRecordService {
 			patientInfoMapper.updatePatientInfo(patient);
 			if (flag > 0) {
 				// 保存签约服务包信息
-				ServicePackage servicePackage = servicePackageMapper.selectServicePackageById(signPatientPackageDto.getServicePackageId());
 				SignPatientPackage signPatientPackage = new SignPatientPackage();
-				BeanUtils.copyBeanProp(signPatientPackage, servicePackage);
 
 				// 服务开始时间、服务结束时间
 				BeanUtils.copyBeanProp(signPatientPackage, signPatientPackageDto);
 				signPatientPackage.setSignPatientRecordId(signPatientRecord.getId());
 				signPatientPackage.setPatientId(signPatientRecord.getPatientId());
-				signPatientPackage.setPackagePaymentStatus(PaymentStatusConstants.UNPAID_FEES);
+				signPatientPackage.setServiceStartTime(signPatientPackageDto.getServiceStartTime().atStartOfDay());
+				signPatientPackage.setServiceEndTime(signPatientPackageDto.getServiceEndTime().atTime(23,59,59));
 				signPatientPackage.setCreateTime(LocalDateTime.now());
 				signPatientPackage.setCreateBy(SecurityUtils.getLoginUser().getUser().getNickName());
-				signPatientPackage.setId(null);
 				signPatientPackageMapper.insertSignPatientPackage(signPatientPackage);
 
 				// 保存管理路径

postdischarge-manage/src/main/java/com/xinelu/manage/service/signroutetriggercondition/impl/SignRouteTriggerConditionServiceImpl.java

@@ -1,9 +1,9 @@
 package com.xinelu.manage.service.signroutetriggercondition.impl;
 
-import com.xinelu.common.utils.DateUtils;
 import com.xinelu.manage.domain.signroutetriggercondition.SignRouteTriggerCondition;
 import com.xinelu.manage.mapper.signroutetriggercondition.SignRouteTriggerConditionMapper;
 import com.xinelu.manage.service.signroutetriggercondition.ISignRouteTriggerConditionService;
+import java.time.LocalDateTime;
 import java.util.List;
 import javax.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -49,7 +49,7 @@ public class SignRouteTriggerConditionServiceImpl implements ISignRouteTriggerCo
      */
     @Override
     public int insertSignRouteTriggerCondition(SignRouteTriggerCondition signRouteTriggerCondition) {
-                signRouteTriggerCondition.setCreateTime(DateUtils.getNowDate());
+                signRouteTriggerCondition.setCreateTime(LocalDateTime.now());
             return signRouteTriggerConditionMapper.insertSignRouteTriggerCondition(signRouteTriggerCondition);
     }
 
@@ -61,7 +61,7 @@ public class SignRouteTriggerConditionServiceImpl implements ISignRouteTriggerCo
      */
     @Override
     public int updateSignRouteTriggerCondition(SignRouteTriggerCondition signRouteTriggerCondition) {
-                signRouteTriggerCondition.setUpdateTime(DateUtils.getNowDate());
+                signRouteTriggerCondition.setUpdateTime(LocalDateTime.now());
         return signRouteTriggerConditionMapper.updateSignRouteTriggerCondition(signRouteTriggerCondition);
     }
 

postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientblacklist/PatientBlacklistVo.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.vo.patientblacklist;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -86,5 +86,5 @@ public class PatientBlacklistVo {
 	 * 创建时间
 	 */
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date createTime;
+	private LocalDateTime createTime;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientInfoVo.java

@@ -7,7 +7,8 @@ import com.xinelu.manage.domain.signpatientpackagehardware.SignPatientPackageHar
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 import lombok.Data;
 
@@ -54,14 +55,14 @@ public class SignPatientInfoVo {
 	/** 出生日期，格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date birthDate;
+	private LocalDate birthDate;
 
 	/**
 	 * 签约时间，格式：yyyy-MM-dd HH:mm:ss
 	 */
 	@ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date signTime;
+	private LocalDateTime signTime;
 
 	/**
 	 * 签约时所属医院名称
@@ -162,12 +163,12 @@ public class SignPatientInfoVo {
 	/** 服务开始时间，格式：yyyy-MM-dd HH:mm:ss */
 	@ApiModelProperty(value = "服务开始时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceStartTime;
+	private LocalDateTime serviceStartTime;
 
 	/** 服务结束时间，格式：yyyy-MM-dd HH:mm:ss */
 	@ApiModelProperty(value = "服务结束时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date serviceEndTime;
+	private LocalDateTime serviceEndTime;
 
 	/**
 	 * 服务包期限

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientListVo.java

@@ -1,10 +1,12 @@
 package com.xinelu.manage.vo.signpatientrecord;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -51,14 +53,20 @@ public class SignPatientListVo {
 	/** 出生日期，格式：yyyy-MM-dd */
 	@ApiModelProperty(value = "出生日期，格式：yyyy-MM-dd")
 	@JsonFormat(pattern = "yyyy-MM-dd")
-	private Date birthDate;
+	private LocalDate birthDate;
 
 	/**
 	 * 签约时间，格式：yyyy-MM-dd HH:mm:ss
 	 */
 	@ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date signTime;
+	private LocalDateTime signTime;
+
+	/**
+	 * 签约时所属医院id
+	 */
+	@ApiModelProperty(value = "签约时所属医院id")
+	private Long hospitalAgencyId;
 
 	/**
 	 * 签约时所属医院名称
@@ -66,18 +74,36 @@ public class SignPatientListVo {
 	@ApiModelProperty(value = "签约时所属医院名称")
 	private String hospitalAgencyName;
 
+	/**
+	 * 签约时所属院区id
+	 */
+	@ApiModelProperty(value = "签约时所属院区id")
+	private Long campusAgencyId;
+
 	/**
 	 * 签约时所属院区名称
 	 */
 	@ApiModelProperty(value = "签约时所属院区名称")
 	private String campusAgencyName;
 
+	/**
+	 * 签约时所属科室id
+	 */
+	@ApiModelProperty(value = "签约时所属科室id")
+	private Long departmentId;
+
 	/**
 	 * 签约时所属科室名称
 	 */
 	@ApiModelProperty(value = "签约时所属科室名称")
 	private String departmentName;
 
+	/**
+	 * 签约时所属病区id
+	 */
+	@ApiModelProperty(value = "签约时所属病区id")
+	private Long wardId;
+
 	/**
 	 * 签约时所属病区名称
 	 */
@@ -134,7 +160,7 @@ public class SignPatientListVo {
 	 */
 	@ApiModelProperty(value = "加入意向时间（意向签约）")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date intentionalTime;
+	private LocalDateTime intentionalTime;
 
 	/**
 	 * 开单医生姓名（意向签约）
@@ -154,11 +180,19 @@ public class SignPatientListVo {
 	@ApiModelProperty(value = "缴费状态，已缴费：PAID，未交费：UNPAID_FEES")
 	private String paymentStatus;
 
+	/** 服务包表id */
+	@ApiModelProperty(value = "服务包表id")
+	@Excel(name = "服务包表id")
+	private Long servicePackageId;
+
 	/** 服务包名称 */
 	@ApiModelProperty(value = "服务包名称")
 	private String packageName;
 
-	/** 服务周期，单位是月 */
+	/** 服务周期 */
-	@ApiModelProperty(value = "服务周期，单位是月")
+	@ApiModelProperty(value = "服务周期")
-	private Integer serviceCycle;
+	private Integer packageTerm;
+
+	@ApiModelProperty(value = "服务周期单位")
+	private String packageTermUnit;
 }

postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientrecord/SignPatientRecordVo.java

@@ -3,7 +3,7 @@ package com.xinelu.manage.vo.signpatientrecord;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Date;
+import java.time.LocalDateTime;
 import lombok.Data;
 
 /**
@@ -35,7 +35,7 @@ public class SignPatientRecordVo {
 
 	@ApiModelProperty(value = "签约时间，格式：yyyy-MM-dd HH:mm:ss")
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	private Date signTime;
+	private LocalDateTime signTime;
 
 	/**
 	 * 服务状态，意向签约：INTENTIONAL_SIGNING，服务中：SERVICE_CENTER，服务结束：SERVICE_END

postdischarge-manage/src/main/resources/mapper/manage/patientvisitrecord/PatientVisitRecordMapper.xml

@@ -72,6 +72,7 @@
 		        and visit_date <= #{visitDateEnd}
 	        </if>
         </where>
+        order by visit_date desc
     </select>
 
     <select id="selectPatientVisitRecordById" parameterType="Long"
@@ -80,169 +81,308 @@
             where id = #{id}
     </select>
 
-    <insert id="insertPatientVisitRecord" parameterType="com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord" useGeneratedKeys="true"
+	<insert id="insertPatientVisitRecord" parameterType="PatientVisitRecord" useGeneratedKeys="true"
-            keyProperty="id">
+		keyProperty="id">
-        insert into patient_visit_record
+		insert into patient_visit_record
-        <trim prefix="(" suffix=")" suffixOverrides=",">
+		<trim prefix="(" suffix=")" suffixOverrides=",">
-                    <if test="patientId != null">patient_id,
+			<if test="patientId != null">patient_id,
-                    </if>
+			</if>
-                    <if test="visitDept != null">visit_dept,
+			<if test="cardNo != null">card_no,
-                    </if>
+			</if>
-                    <if test="visitName != null">visit_name,
+			<if test="patientName != null">patient_name,
-                    </if>
+			</if>
-                    <if test="visitDate != null">visit_date,
+			<if test="patientPhone != null">patient_phone,
-                    </if>
+			</if>
-                    <if test="visitType != null">visit_type,
+			<if test="familyMemberPhone != null">family_member_phone,
-                    </if>
+			</if>
-                    <if test="patientName != null">patient_name,
+			<if test="address != null">address,
-                    </if>
+			</if>
-                    <if test="birthplace != null">birthplace,
+			<if test="sex != null">sex,
-                    </if>
+			</if>
-                    <if test="sex != null">sex,
+			<if test="birthDate != null">birth_date,
-                    </if>
+			</if>
-                    <if test="age != null">age,
+			<if test="age != null">age,
-                    </if>
+			</if>
-                    <if test="nation != null">nation,
+			<if test="nation != null">nation,
-                    </if>
+			</if>
-                    <if test="marriage != null">marriage,
+			<if test="visitType != null">visit_type,
-                    </if>
+			</if>
-                    <if test="medicalHistoryNarrator != null">medical_history_narrator,
+			<if test="visitDate != null">visit_date,
-                    </if>
+			</if>
-                    <if test="admissionTime != null">admission_time,
+			<if test="visitName != null">visit_name,
-                    </if>
+			</if>
-                    <if test="dischargeTime != null">discharge_time,
+			<if test="hospitalAgencyId != null">hospital_agency_id,
-                    </if>
+			</if>
-                    <if test="recordTime != null">record_time,
+			<if test="hospitalAgencyName != null">hospital_agency_name,
-                    </if>
+			</if>
-                    <if test="outpatientVisitInfo != null">outpatient_visit_info,
+			<if test="campusAgencyId != null">campus_agency_id,
-                    </if>
+			</if>
-                    <if test="hospitalizationDays != null">hospitalization_days,
+			<if test="campusAgencyName != null">campus_agency_name,
-                    </if>
+			</if>
-                    <if test="createBy != null">create_by,
+			<if test="departmentId != null">department_id,
-                    </if>
+			</if>
-                    <if test="createTime != null">create_time,
+			<if test="departmentName != null">department_name,
-                    </if>
+			</if>
-                    <if test="updateBy != null">update_by,
+			<if test="wardId != null">ward_id,
-                    </if>
+			</if>
-                    <if test="updateTime != null">update_time,
+			<if test="wardName != null">ward_name,
-                    </if>
+			</if>
-        </trim>
+			<if test="attendingPhysicianId != null">attending_physician_id,
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
+			</if>
-                    <if test="patientId != null">#{patientId},
+			<if test="attendingPhysicianName != null">attending_physician_name,
-                    </if>
+			</if>
-                    <if test="visitDept != null">#{visitDept},
+			<if test="mainDiagnosis != null">main_diagnosis,
-                    </if>
+			</if>
-                    <if test="visitName != null">#{visitName},
+			<if test="marriage != null">marriage,
-                    </if>
+			</if>
-                    <if test="visitDate != null">#{visitDate},
+			<if test="medicalHistoryNarrator != null">medical_history_narrator,
-                    </if>
+			</if>
-                    <if test="visitType != null">#{visitType},
+			<if test="admissionTime != null">admission_time,
-                    </if>
+			</if>
-                    <if test="patientName != null">#{patientName},
+			<if test="dischargeTime != null">discharge_time,
-                    </if>
+			</if>
-                    <if test="birthplace != null">#{birthplace},
+			<if test="recordTime != null">record_time,
-                    </if>
+			</if>
-                    <if test="sex != null">#{sex},
+			<if test="outpatientVisitInfo != null">outpatient_visit_info,
-                    </if>
+			</if>
-                    <if test="age != null">#{age},
+			<if test="hospitalizationDays != null">hospitalization_days,
-                    </if>
+			</if>
-                    <if test="nation != null">#{nation},
+			<if test="inHospitalInfo != null">in_hospital_info,
-                    </if>
+			</if>
-                    <if test="marriage != null">#{marriage},
+			<if test="outHospitalInfo != null">out_hospital_info,
-                    </if>
+			</if>
-                    <if test="medicalHistoryNarrator != null">#{medicalHistoryNarrator},
+			<if test="visitSerialNumber != null">visit_serial_number,
-                    </if>
+			</if>
-                    <if test="admissionTime != null">#{admissionTime},
+			<if test="inHospitalNumber != null">in_hospital_number,
-                    </if>
+			</if>
-                    <if test="dischargeTime != null">#{dischargeTime},
+			<if test="responsibleNurse != null">responsible_nurse,
-                    </if>
+			</if>
-                    <if test="recordTime != null">#{recordTime},
+			<if test="surgicalName != null">surgical_name,
-                    </if>
+			</if>
-                    <if test="outpatientVisitInfo != null">#{outpatientVisitInfo},
+			<if test="createBy != null">create_by,
-                    </if>
+			</if>
-                    <if test="hospitalizationDays != null">#{hospitalizationDays},
+			<if test="createTime != null">create_time,
-                    </if>
+			</if>
-                    <if test="createBy != null">#{createBy},
+			<if test="updateBy != null">update_by,
-                    </if>
+			</if>
-                    <if test="createTime != null">#{createTime},
+			<if test="updateTime != null">update_time,
-                    </if>
+			</if>
-                    <if test="updateBy != null">#{updateBy},
+		</trim>
-                    </if>
+		<trim prefix="values (" suffix=")" suffixOverrides=",">
-                    <if test="updateTime != null">#{updateTime},
+			<if test="patientId != null">#{patientId},
-                    </if>
+			</if>
-        </trim>
+			<if test="cardNo != null">#{cardNo},
-    </insert>
+			</if>
-
+			<if test="patientName != null">#{patientName},
-    <update id="updatePatientVisitRecord" parameterType="com.xinelu.manage.domain.patientvisitrecord.PatientVisitRecord">
+			</if>
-        update patient_visit_record
+			<if test="patientPhone != null">#{patientPhone},
-        <trim prefix="SET" suffixOverrides=",">
+			</if>
-                    <if test="patientId != null">patient_id =
+			<if test="familyMemberPhone != null">#{familyMemberPhone},
-                        #{patientId},
+			</if>
-                    </if>
+			<if test="address != null">#{address},
-                    <if test="visitDept != null">visit_dept =
+			</if>
-                        #{visitDept},
+			<if test="sex != null">#{sex},
-                    </if>
+			</if>
-                    <if test="visitName != null">visit_name =
+			<if test="birthDate != null">#{birthDate},
-                        #{visitName},
+			</if>
-                    </if>
+			<if test="age != null">#{age},
-                    <if test="visitDate != null">visit_date =
+			</if>
-                        #{visitDate},
+			<if test="nation != null">#{nation},
-                    </if>
+			</if>
-                    <if test="visitType != null">visit_type =
+			<if test="visitType != null">#{visitType},
-                        #{visitType},
+			</if>
-                    </if>
+			<if test="visitDate != null">#{visitDate},
-                    <if test="patientName != null">patient_name =
+			</if>
-                        #{patientName},
+			<if test="visitName != null">#{visitName},
-                    </if>
+			</if>
-                    <if test="birthplace != null">birthplace =
+			<if test="hospitalAgencyId != null">#{hospitalAgencyId},
-                        #{birthplace},
+			</if>
-                    </if>
+			<if test="hospitalAgencyName != null">#{hospitalAgencyName},
-                    <if test="sex != null">sex =
+			</if>
-                        #{sex},
+			<if test="campusAgencyId != null">#{campusAgencyId},
-                    </if>
+			</if>
-                    <if test="age != null">age =
+			<if test="campusAgencyName != null">#{campusAgencyName},
-                        #{age},
+			</if>
-                    </if>
+			<if test="departmentId != null">#{departmentId},
-                    <if test="nation != null">nation =
+			</if>
-                        #{nation},
+			<if test="departmentName != null">#{departmentName},
-                    </if>
+			</if>
-                    <if test="marriage != null">marriage =
+			<if test="wardId != null">#{wardId},
-                        #{marriage},
+			</if>
-                    </if>
+			<if test="wardName != null">#{wardName},
-                    <if test="medicalHistoryNarrator != null">medical_history_narrator =
+			</if>
-                        #{medicalHistoryNarrator},
+			<if test="attendingPhysicianId != null">#{attendingPhysicianId},
-                    </if>
+			</if>
-                    <if test="admissionTime != null">admission_time =
+			<if test="attendingPhysicianName != null">#{attendingPhysicianName},
-                        #{admissionTime},
+			</if>
-                    </if>
+			<if test="mainDiagnosis != null">#{mainDiagnosis},
-                    <if test="dischargeTime != null">discharge_time =
+			</if>
-                        #{dischargeTime},
+			<if test="marriage != null">#{marriage},
-                    </if>
+			</if>
-                    <if test="recordTime != null">record_time =
+			<if test="medicalHistoryNarrator != null">#{medicalHistoryNarrator},
-                        #{recordTime},
+			</if>
-                    </if>
+			<if test="admissionTime != null">#{admissionTime},
-                    <if test="outpatientVisitInfo != null">outpatient_visit_info =
+			</if>
-                        #{outpatientVisitInfo},
+			<if test="dischargeTime != null">#{dischargeTime},
-                    </if>
+			</if>
-                    <if test="hospitalizationDays != null">hospitalization_days =
+			<if test="recordTime != null">#{recordTime},
-                        #{hospitalizationDays},
+			</if>
-                    </if>
+			<if test="outpatientVisitInfo != null">#{outpatientVisitInfo},
-                    <if test="createBy != null">create_by =
+			</if>
-                        #{createBy},
+			<if test="hospitalizationDays != null">#{hospitalizationDays},
-                    </if>
+			</if>
-                    <if test="createTime != null">create_time =
+			<if test="inHospitalInfo != null">#{inHospitalInfo},
-                        #{createTime},
+			</if>
-                    </if>
+			<if test="outHospitalInfo != null">#{outHospitalInfo},
-                    <if test="updateBy != null">update_by =
+			</if>
-                        #{updateBy},
+			<if test="visitSerialNumber != null">#{visitSerialNumber},
-                    </if>
+			</if>
-                    <if test="updateTime != null">update_time =
+			<if test="inHospitalNumber != null">#{inHospitalNumber},
-                        #{updateTime},
+			</if>
-                    </if>
+			<if test="responsibleNurse != null">#{responsibleNurse},
-        </trim>
+			</if>
-        where id = #{id}
+			<if test="surgicalName != null">#{surgicalName},
-    </update>
+			</if>
+			<if test="createBy != null">#{createBy},
+			</if>
+			<if test="createTime != null">#{createTime},
+			</if>
+			<if test="updateBy != null">#{updateBy},
+			</if>
+			<if test="updateTime != null">#{updateTime},
+			</if>
+		</trim>
+	</insert>
 
+	<update id="updatePatientVisitRecord" parameterType="PatientVisitRecord">
+		update patient_visit_record
+		<trim prefix="SET" suffixOverrides=",">
+			<if test="patientId != null">patient_id =
+				#{patientId},
+			</if>
+			<if test="cardNo != null">card_no =
+				#{cardNo},
+			</if>
+			<if test="patientName != null">patient_name =
+				#{patientName},
+			</if>
+			<if test="patientPhone != null">patient_phone =
+				#{patientPhone},
+			</if>
+			<if test="familyMemberPhone != null">family_member_phone =
+				#{familyMemberPhone},
+			</if>
+			<if test="address != null">address =
+				#{address},
+			</if>
+			<if test="sex != null">sex =
+				#{sex},
+			</if>
+			<if test="birthDate != null">birth_date =
+				#{birthDate},
+			</if>
+			<if test="age != null">age =
+				#{age},
+			</if>
+			<if test="nation != null">nation =
+				#{nation},
+			</if>
+			<if test="visitType != null">visit_type =
+				#{visitType},
+			</if>
+			<if test="visitDate != null">visit_date =
+				#{visitDate},
+			</if>
+			<if test="visitName != null">visit_name =
+				#{visitName},
+			</if>
+			<if test="hospitalAgencyId != null">hospital_agency_id =
+				#{hospitalAgencyId},
+			</if>
+			<if test="hospitalAgencyName != null">hospital_agency_name =
+				#{hospitalAgencyName},
+			</if>
+			<if test="campusAgencyId != null">campus_agency_id =
+				#{campusAgencyId},
+			</if>
+			<if test="campusAgencyName != null">campus_agency_name =
+				#{campusAgencyName},
+			</if>
+			<if test="departmentId != null">department_id =
+				#{departmentId},
+			</if>
+			<if test="departmentName != null">department_name =
+				#{departmentName},
+			</if>
+			<if test="wardId != null">ward_id =
+				#{wardId},
+			</if>
+			<if test="wardName != null">ward_name =
+				#{wardName},
+			</if>
+			<if test="attendingPhysicianId != null">attending_physician_id =
+				#{attendingPhysicianId},
+			</if>
+			<if test="attendingPhysicianName != null">attending_physician_name =
+				#{attendingPhysicianName},
+			</if>
+			<if test="mainDiagnosis != null">main_diagnosis =
+				#{mainDiagnosis},
+			</if>
+			<if test="marriage != null">marriage =
+				#{marriage},
+			</if>
+			<if test="medicalHistoryNarrator != null">medical_history_narrator =
+				#{medicalHistoryNarrator},
+			</if>
+			<if test="admissionTime != null">admission_time =
+				#{admissionTime},
+			</if>
+			<if test="dischargeTime != null">discharge_time =
+				#{dischargeTime},
+			</if>
+			<if test="recordTime != null">record_time =
+				#{recordTime},
+			</if>
+			<if test="outpatientVisitInfo != null">outpatient_visit_info =
+				#{outpatientVisitInfo},
+			</if>
+			<if test="hospitalizationDays != null">hospitalization_days =
+				#{hospitalizationDays},
+			</if>
+			<if test="inHospitalInfo != null">in_hospital_info =
+				#{inHospitalInfo},
+			</if>
+			<if test="outHospitalInfo != null">out_hospital_info =
+				#{outHospitalInfo},
+			</if>
+			<if test="visitSerialNumber != null">visit_serial_number =
+				#{visitSerialNumber},
+			</if>
+			<if test="inHospitalNumber != null">in_hospital_number =
+				#{inHospitalNumber},
+			</if>
+			<if test="responsibleNurse != null">responsible_nurse =
+				#{responsibleNurse},
+			</if>
+			<if test="surgicalName != null">surgical_name =
+				#{surgicalName},
+			</if>
+			<if test="createBy != null">create_by =
+				#{createBy},
+			</if>
+			<if test="createTime != null">create_time =
+				#{createTime},
+			</if>
+			<if test="updateBy != null">update_by =
+				#{updateBy},
+			</if>
+			<if test="updateTime != null">update_time =
+				#{updateTime},
+			</if>
+		</trim>
+		where id = #{id}
+	</update>
     <delete id="deletePatientVisitRecordById" parameterType="Long">
         delete from patient_visit_record where id = #{id}
     </delete>

postdischarge-manage/src/main/resources/mapper/manage/signpatientpackage/SignPatientPackageMapper.xml

@@ -14,7 +14,8 @@
             <result property="packagePrice" column="package_price"/>
             <result property="serviceStartTime" column="service_start_time"/>
             <result property="serviceEndTime" column="service_end_time"/>
-            <result property="serviceCycle" column="service_cycle"/>
+            <result property="packageTerm" column="package_term"/>
+	        <result property="packageTermUnit" column="package_term_unit"/>
             <result property="createBy" column="create_by"/>
             <result property="createTime" column="create_time"/>
             <result property="updateBy" column="update_by"/>
@@ -22,7 +23,8 @@
     </resultMap>
 
     <sql id="selectSignPatientPackageVo">
-        select id, patient_id, sign_patient_record_id, service_package_id, package_name, package_payment_status, package_price, service_start_time, service_end_time, service_cycle, create_by, create_time, update_by, update_time from sign_patient_package
+        select id, patient_id, sign_patient_record_id, service_package_id, package_name, package_payment_status, package_price,
+               service_start_time, service_end_time, package_term, package_term_unit, create_by, create_time, update_by, update_time from sign_patient_package
     </sql>
 
     <select id="selectSignPatientPackageList" parameterType="SignPatientPackage" resultMap="SignPatientPackageResult">
@@ -52,8 +54,11 @@
 	        <if test="serviceEndTime != null ">
 	            and service_end_time = #{serviceEndTime}
 	        </if>
-	        <if test="serviceCycle != null ">
+	        <if test="packageTerm != null ">
-	            and service_cycle = #{serviceCycle}
+		        and package_term = #{packageTerm}
+	        </if>
+	        <if test="packageTermUnit != null ">
+		        and package_term_unit = #{packageTermUnit}
 	        </if>
         </where>
     </select>
@@ -84,8 +89,10 @@
                     </if>
                     <if test="serviceEndTime != null">service_end_time,
                     </if>
-                    <if test="serviceCycle != null">service_cycle,
+                    <if test="packageTerm != null">package_term,
                     </if>
+			        <if test="packageTermUnit != null">package_term_unit,
+			        </if>
                     <if test="createBy != null">create_by,
                     </if>
                     <if test="createTime != null">create_time,
@@ -113,8 +120,10 @@
             </if>
             <if test="serviceEndTime != null">#{serviceEndTime},
             </if>
-            <if test="serviceCycle != null">#{serviceCycle},
+            <if test="packageTerm != null">#{packageTerm},
             </if>
+	        <if test="packageTermUnit != null">#{packageTermUnit},
+	        </if>
             <if test="createBy != null">#{createBy},
             </if>
             <if test="createTime != null">#{createTime},
@@ -153,9 +162,12 @@
             <if test="serviceEndTime != null">service_end_time =
                 #{serviceEndTime},
             </if>
-            <if test="serviceCycle != null">service_cycle =
+            <if test="packageTerm != null">package_term =
-                #{serviceCycle},
+                #{packageTerm},
             </if>
+	        <if test="packageTermUnit != null">package_term_unit =
+		        #{packageTermUnit},
+	        </if>
             <if test="createBy != null">create_by =
                 #{createBy},
             </if>

postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml

@@ -329,12 +329,13 @@
 		sign.id,sign.patient_id,sign.patient_name,
 		sign.patient_phone,sign.card_no,sign.sex,sign.birth_date, sign.sign_time,
 		sign.hospital_agency_id,sign.hospital_agency_name,
-		sign.campus_agency_name,sign.department_name,
+		sign.campus_agency_id, sign.campus_agency_name,
-		sign.ward_name,sign.visit_serial_number,
+		sign.department_id, sign.department_name,
-		sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis,
+		sign.ward_id,sign.ward_name,
+		sign.visit_serial_number,sign.visit_method,sign.in_hospital_number,sign.sign_diagnosis,sign.review_diagnosis,
 		sign.service_status,sign.sign_status,sign.intentional_source,
 		sign.intentional_time,sign.billing_doctor_name,sign.payment_status,sign.price,
-		p.package_name, p.service_end_time, p.service_cycle
+		p.service_package_id, p.package_name, p.service_end_time, p.package_term, p.package_term_unit
 		from patient_info patient
 		    left join sign_patient_record sign on patient.sign_patient_record_id = sign.id
 		    left join sign_patient_package p on sign.id = p.sign_patient_record_id

postdischarge-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -120,7 +120,7 @@
             AND u.phonenumber like concat('%', #{phonenumber}, '%')
         </if>
         <if test="postName != null and postName != ''">
-          and u.post_name = #{userBirthDate}
+          and u.post_name = #{postName}
         </if>
         <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
             AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')