心理测试代码初始化

common/src/main/java/com/diagbot/enums/SysTypeEnum.java

@@ -31,7 +31,8 @@ public enum SysTypeEnum implements KeyedNamed {
     PRECMAN_SERVICE(18, "precman-service"),
     MRQCMAN_SERVICE(19, "mrqcman-service"),
     ZNWZ_SERVICE(21, "znwz-service"),
-    ZZCX_SERVICE(22, "zzcx-service");
+    ZZCX_SERVICE(22, "zzcx-service"),
+    XLCS_SERVICE(23, "xlcs-service");
 
     @Setter
     private int key;

xlcs-service/src/main/java/com/diagbot/aop/SysLoggerAspect.java

@@ -32,7 +32,7 @@
 //    @Before("loggerPointCut()")
 //    public void saveSysLog(JoinPoint joinPoint) {
 //        //入参设置
-//        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.ZZCX_SERVICE.getKey());
+//        SysLog sysLog = AopUtil.sysLoggerAspect(joinPoint, SysTypeEnum.XLCS_SERVICE.getKey());
 //        //保存系统日志
 //        mySender.outputLogSend(sysLog);
 //    }

xlcs-service/src/main/java/com/diagbot/dto/InquiryDTO.java

@@ -1,12 +1,9 @@
 package com.diagbot.dto;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Getter;
 import lombok.Setter;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Description:
@@ -23,6 +20,7 @@ public class InquiryDTO {
      */
     private Long id;
 
+
     /**
      * 记录创建时间
      */
@@ -33,11 +31,6 @@ public class InquiryDTO {
      */
     private Date gmtModified;
 
-    /**
-     * 诊断
-     */
-    private String diagnosis;
-
     /**
      * 医院名称
      */
@@ -74,7 +67,38 @@ public class InquiryDTO {
     private String idNum;
 
     /**
-     * 诊断程度(1：高，2：中，3：低)
+     * 人员类型
+     */
+    private String personnel;
+
+    /**
+     * 焦虑症总分
+     */
+    private String anxietyPoint;
+
+    /**
+     * 焦虑症判断依据
      */
-    private Integer degree;
+    private String anxietyJudge;
+
+    /**
+     * 焦虑症建议
+     */
+    private String anxietyAdvise;
+
+    /**
+     * 抑郁症总分
+     */
+    private String depressionPoint;
+
+    /**
+     * 抑郁症判断依据
+     */
+    private String depressionJudge;
+
+    /**
+     * 抑郁症建议
+     */
+    private String depressionAdvise;
+
 }

xlcs-service/src/main/java/com/diagbot/dto/InquiryPatDTO.java

@@ -1,11 +1,8 @@
 package com.diagbot.dto;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.Date;
-
 /**
  * @Description:
  * @author: zhoutg

xlcs-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -56,10 +56,6 @@ public class InquiryInfo implements Serializable {
      */
     private String modifier;
 
-    /**
-     * 诊断
-     */
-    private String diagnosis;
 
     /**
      * 医院名称
@@ -97,9 +93,39 @@ public class InquiryInfo implements Serializable {
     private String idNum;
 
     /**
-     * 诊断程度(1：高，2：中，3：低)
+     * 人员类型
+     */
+    private String personnel;
+
+    /**
+     * 焦虑症总分
+     */
+    private String anxietyPoint;
+
+    /**
+     * 焦虑症判断依据
+     */
+    private String anxietyJudge;
+
+    /**
+     * 焦虑症建议
+     */
+    private String anxietyAdvise;
+
+    /**
+     * 抑郁症总分
+     */
+    private String depressionPoint;
+
+    /**
+     * 抑郁症判断依据
+     */
+    private String depressionJudge;
+
+    /**
+     * 抑郁症建议
      */
-    private Integer degree;
+    private String depressionAdvise;
 
     /**
      * 备注

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

@@ -81,13 +81,23 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         } else {
             inquiryInfo.setGmtModified(now);
             inquiryInfo.setIp(HttpUtils.getIpAddress());
-            inquiryInfo.setDiagnosis(saveInquiryVO.getDiagnosis());
-            inquiryInfo.setDegree(saveInquiryVO.getDegree());
+            inquiryInfo.setPersonnel(saveInquiryVO.getPersonnel());
+            inquiryInfo.setAnxietyPoint(saveInquiryVO.getAnxietyPoint());
+            inquiryInfo.setAnxietyJudge(saveInquiryVO.getAnxietyJudge());
+            inquiryInfo.setAnxietyAdvise(saveInquiryVO.getAnxietyAdvise());
+            inquiryInfo.setDepressionPoint(saveInquiryVO.getDepressionPoint());
+            inquiryInfo.setDepressionJudge(saveInquiryVO.getDepressionJudge());
+            inquiryInfo.setDepressionAdvise(saveInquiryVO.getDepressionAdvise());
             this.update(new UpdateWrapper<InquiryInfo>()
                     .set("ip", HttpUtils.getIpAddress())
                     .set("gmt_modified", now)
-                    .set("diagnosis", saveInquiryVO.getDiagnosis())
-                    .set("degree", saveInquiryVO.getDegree())
+                    .set("personnel", saveInquiryVO.getPersonnel())
+                    .set("anxiety_point", saveInquiryVO.getAnxietyPoint())
+                    .set("anxiety_judge", saveInquiryVO.getAnxietyJudge())
+                    .set("anxiety_advise", saveInquiryVO.getAnxietyAdvise())
+                    .set("depression_point", saveInquiryVO.getDepressionPoint())
+                    .set("depression_judge", saveInquiryVO.getDepressionJudge())
+                    .set("depression_advise", saveInquiryVO.getDepressionAdvise())
                     .eq("id", inquiryInfo.getId())
             );
             // 删除原明细

xlcs-service/src/main/java/com/diagbot/vo/InquiryPatVO.java

@@ -34,8 +34,8 @@ public class InquiryPatVO {
      */
     private String idNum;
 
-    /**
-     * 诊断程度(1：高，2：中，3：低)
-     */
-    private Integer degree;
+//    /**
+//     * 诊断程度(1：高，2：中，3：低)
+//     */
+//    private Integer degree;
 }

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

@@ -24,9 +24,6 @@ public class SaveInquiryVO {
     @ApiModelProperty(value = "访问者的IP", hidden = true)
     private String ip;
 
-    @ApiModelProperty(value = "诊断", required = true)
-    private String diagnosis;
-
     @Valid
     @ApiModelProperty(value = "问诊明细", required = true)
     private List<SaveInquiryDetailVO> detailList;
@@ -46,6 +43,24 @@ public class SaveInquiryVO {
     @ApiModelProperty(value = "证件号")
     private String idNum;
 
-    @ApiModelProperty(value = "诊断程度(1：高，2：中，3：低)")
-    private Integer degree;
+    @ApiModelProperty(value = "人员类型")
+    private String personnel;
+
+    @ApiModelProperty(value = "焦虑症总分")
+    private String anxietyPoint;
+
+    @ApiModelProperty(value = "焦虑症判断依据")
+    private String anxietyJudge;
+
+    @ApiModelProperty(value = "焦虑症建议")
+    private String anxietyAdvise;
+
+    @ApiModelProperty(value = "抑郁症总分")
+    private String depressionPoint;
+
+    @ApiModelProperty(value = "抑郁症判断依据")
+    private String depressionJudge;
+
+    @ApiModelProperty(value = "抑郁症建议")
+    private String depressionAdvise;
 }

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

@@ -11,8 +11,19 @@
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
         <result column="hospital_code" property="hospitalCode" />
-        <result column="diagnosis" property="diagnosis" />
         <result column="ip" property="ip" />
+        <result column="pat_name" property="patName" />
+        <result column="pat_age" property="patAge" />
+        <result column="pat_sex" property="patSex" />
+        <result column="id_type" property="idType" />
+        <result column="id_num" property="idNum" />
+        <result column="personnel" property="personnel" />
+        <result column="anxiety_point" property="anxietyPoint" />
+        <result column="anxiety_judge" property="anxietyJudge" />
+        <result column="anxiety_advise" property="anxietyAdvise" />
+        <result column="depression_point" property="depressionPoint" />
+        <result column="depression_judge" property="depressionJudge" />
+        <result column="depression_advise" property="depressionAdvise" />
         <result column="remark" property="remark" />
     </resultMap>
 
@@ -34,9 +45,6 @@
         <if test="idNum != null and idNum != '' ">
             and id_num like concat('%', #{idNum}, '%')
         </if>
-        <if test="degree != null and degree != '' ">
-            and degree = #{degree}
-        </if>
         order by pat_name
     </select>
 

xlcs-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -27,7 +27,7 @@ public class CodeGeneration {
 
         // 全局配置
         GlobalConfig gc = new GlobalConfig();
-        gc.setOutputDir("E://code//zzcxservice");
+        gc.setOutputDir("E://code//xlcsservice");
         gc.setFileOverride(true);
         gc.setActiveRecord(false);// 不需要ActiveRecord特性的请改为false
         gc.setEnableCache(false);// XML 二级缓存
@@ -49,14 +49,14 @@ public class CodeGeneration {
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
         dsc.setPassword("lantone");
-        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-zzcx?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
+        dsc.setUrl("jdbc:mysql://192.168.2.236:3306/sys-xlcs?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf-8");
         mpg.setDataSource(dsc);
 
         // 策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setTablePrefix(new String[] { "zzcx_" });// 此处可以修改为您的表前缀
+        strategy.setTablePrefix(new String[] { "xlcs_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "zzcx_sys_set" }); // 需要生成的表
+        strategy.setInclude(new String[] { "xlcs_inquiry_info" }); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);