Merge branch 'dev/zzcx20200202_init' into 122run

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/InquiryInfo.java

@@ -60,6 +60,11 @@ public class InquiryInfo implements Serializable {
      */
     private String diagnosis;
 
+    /**
+     * 医院名称
+     */
+    private String hospitalCode;
+
     /**
      * 访问者的IP
      */

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,8 @@ import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.SaveInquiryVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -32,6 +34,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     private InquiryDetailServiceImpl inquiryDetailService;
 
     public void saveInquiry(SaveInquiryVO saveInquiryVO) {
+        if (StringUtil.isBlank(saveInquiryVO.getHospitalCode())) {
+            saveInquiryVO.setHospitalCode("朗通通用");
+        }
         Date now = DateUtil.now();
 
         InquiryInfo inquiryInfo = new InquiryInfo();
@@ -49,8 +54,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,8 @@ import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.OptInfoServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.HttpUtils;
+import com.diagbot.util.StringUtil;
+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 +28,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(StringUtil.isNotBlank(hospitalVO.getHospitalCode()) ? 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,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @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

@@ -6,9 +6,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -21,6 +18,10 @@ import java.util.List;
 @Setter
 public class SaveInquiryVO {
 
+    //医院名称
+//    @NotBlank(message = "请输入医院信息")
+    private String hospitalCode;
+
     /**
      * 访问者的IP
      */

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

@@ -33,7 +33,7 @@ public class InquiryInfoController {
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
-    public RespDTO<Boolean> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
+    public RespDTO<Boolean> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
         inquiryInfoFacade.saveInquiry(saveInquiryVO);
         return RespDTO.onSuc(true);
     }

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

@@ -4,6 +4,7 @@ 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;
@@ -34,12 +35,13 @@ public class OptInfoController {
     @PostMapping("/saveOptInfo")
     @SysLogger("saveOptInfo")
     @Transactional
-    public RespDTO<Boolean> saveOptOnfo() {
-        return RespDTO.onSuc(optInfoFacade.saveOptOnfo("1"));
+    public RespDTO<Boolean> saveOptOnfo(@RequestBody HospitalVO hospitalVO) {
+        return RespDTO.onSuc(optInfoFacade.saveOptOnfo(hospitalVO, "1"));
     }
 
     @ApiOperation(value = "获取合计数据[by:gaodm]",
-            notes = "startDate： 开始时间，Date<br>" +
+            notes = "hospitalCode： 医院名称，String<br>" +
+                    "startDate： 开始时间，Date<br>" +
                     "endDate： 结束时间，Date<br>")
     @PostMapping("/getOptSum")
     @SysLogger("getOptSum")

zzcx-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -10,17 +10,9 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="app_id" property="appId" />
-        <result column="organ_name" property="organName" />
-        <result column="department" property="department" />
-        <result column="doctor_id" property="doctorId" />
-        <result column="doctor_name" property="doctorName" />
-        <result column="mpi_id" property="mpiId" />
-        <result column="patient_name" property="patientName" />
-        <result column="patient_age" property="patientAge" />
-        <result column="patient_sex" property="patientSex" />
+        <result column="hospital_code" property="hospitalCode" />
         <result column="diagnosis" property="diagnosis" />
-        <result column="ret_url" property="retUrl" />
+        <result column="ip" property="ip" />
         <result column="remark" property="remark" />
     </resultMap>
 

zzcx-service/src/main/resources/mapper/OptInfoMapper.xml

@@ -10,6 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
+        <result column="hospital_code" property="hospitalCode" />
         <result column="ip" property="ip" />
         <result column="opt_type" property="optType" />
         <result column="remark" property="remark" />
@@ -23,6 +24,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 1
+        <if test="hospitalCode != null and hospitalCode != ''">
+          AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
           AND gmt_create &gt;= #{startDate}
         </if>
@@ -42,6 +46,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 1
+        <if test="hospitalCode != null and hospitalCode != ''">
+            AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>
@@ -63,6 +70,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 1
+        <if test="hospitalCode != null and hospitalCode != ''">
+            AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>
@@ -88,6 +98,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 1
+        <if test="hospitalCode != null and hospitalCode != ''">
+            AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>
@@ -110,6 +123,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 2
+        <if test="hospitalCode != null and hospitalCode != ''">
+            AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>
@@ -135,6 +151,9 @@
         zzcx_opt_info
         WHERE
         opt_type = 2
+        <if test="hospitalCode != null and hospitalCode != ''">
+            AND hospital_code = #{hospitalCode}
+        </if>
         <if test="startDate!=null">
             AND gmt_create &gt;= #{startDate}
         </if>