公用和台州市立医院自诊环境配置

docs/030.20200202自诊程序初始化脚本/add_sql

@@ -0,0 +1,6 @@
+use `sys-zzcx`;
+ALTER TABLE `zzcx_opt_info`
+ADD COLUMN `hospital_code` varchar(255) NOT NULL DEFAULT '朗通通用' COMMENT '医院名称' after `modifier`;
+
+ALTER TABLE `zzcx_inquiry_info`
+ADD COLUMN `hospital_code` varchar(255) NOT NULL DEFAULT '朗通通用' COMMENT '医院名称' after `modifier`;

zzcx-service/src/main/java/com/diagbot/entity/OptInfo.java

@@ -51,6 +51,9 @@ public class OptInfo implements Serializable {
      */
     private String modifier;
 
+    //医院编码
+    private String hospitalCode;
+
     /**
      * 访问者的IP
      */
@@ -114,6 +117,14 @@ public class OptInfo implements Serializable {
         this.modifier = modifier;
     }
 
+    public String getHospitalCode() {
+        return hospitalCode;
+    }
+
+    public void setHospitalCode(String hospitalCode) {
+        this.hospitalCode = hospitalCode;
+    }
+
     public String getIp() {
         return ip;
     }

zzcx-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.SaveInquiryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -49,8 +50,10 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         });
         inquiryDetailService.saveBatch(inquiryDetailList);
 
+        HospitalVO hospitalVO = new HospitalVO();
+        hospitalVO.setHospitalCode(saveInquiryVO.getHospitalCode());
         // 保存记录表
-        optInfoFacade.saveOptOnfo("2");
+        optInfoFacade.saveOptOnfo(hospitalVO, "2");
     }
 
 }

zzcx-service/src/main/java/com/diagbot/facade/OptInfoFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OptInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.OptVO;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,12 +27,13 @@ public class OptInfoFacade extends OptInfoServiceImpl {
     @Autowired
     DataBeanAggregateQueryFacade dataBeanAggregateQueryFacade;
 
-    public Boolean saveOptOnfo(String optType) {
+    public Boolean saveOptOnfo(HospitalVO hospitalVO, String optType) {
         OptInfo optInfo = new OptInfo();
         Date now = DateUtil.now();
         optInfo.setGmtModified(now);
         optInfo.setGmtCreate(now);
         optInfo.setIp(HttpUtils.getIpAddress());
+        optInfo.setHospitalCode(hospitalVO.getHospitalCode());
         optInfo.setOptType(optType);
         Boolean res = this.save(optInfo);
         return res;

zzcx-service/src/main/java/com/diagbot/vo/HospitalVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Description:
+ * @author: gaodm
+ * @time: 2020/2/5 12:44
+ */
+@Getter
+@Setter
+public class HospitalVO {
+    //医院编码
+    @NotBlank(message = "请输入医院信息")
+    private String hospitalCode;
+}

zzcx-service/src/main/java/com/diagbot/vo/OptVO.java

@@ -15,6 +15,8 @@ import java.util.Date;
 @Getter
 @Setter
 public class OptVO {
+    //医院编码
+    private String hospitalCode;
     //开始时间
     @ApiModelProperty(value="开始时间，格式为：2018-11-28 17:25:30")
     @DateTimeFormat(pattern="yyyy-MM-dd hh:mm:ss")

zzcx-service/src/main/java/com/diagbot/vo/SaveInquiryVO.java

@@ -21,6 +21,10 @@ import java.util.List;
 @Setter
 public class SaveInquiryVO {
 
+    //医院编码
+    @NotBlank(message = "请输入医院信息")
+    private String hospitalCode;
+
     /**
      * 访问者的IP
      */

zzcx-service/src/main/java/com/diagbot/web/OptInfoController.java

@@ -4,11 +4,13 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.OptDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.OptInfoFacade;
+import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.OptVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -34,8 +36,8 @@ public class OptInfoController {
     @PostMapping("/saveOptInfo")
     @SysLogger("saveOptInfo")
     @Transactional
-    public RespDTO<Boolean> saveOptOnfo() {
-        return RespDTO.onSuc(optInfoFacade.saveOptOnfo("1"));
+    public RespDTO<Boolean> saveOptOnfo(@RequestBody @Validated HospitalVO hospitalVO) {
+        return RespDTO.onSuc(optInfoFacade.saveOptOnfo(hospitalVO,"1"));
     }
 
     @ApiOperation(value = "获取合计数据[by:gaodm]",