接口题目层增加answerps字段门诊记录接口新加否已随访的标记

sinake

3 天以前 a389acecd582e81c34037326d5808152f97efffb

接口题目层增加answerps字段门诊记录接口新加否已随访的标记

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/HNGatherPatArchiveController.java

@@ -38,6 +38,7 @@
@RestController
@RequestMapping("/smartor/hngather")
@Api(description = "河南采集患者信息接口")

public class HNGatherPatArchiveController extends BaseController {
    @Autowired
    private IHNGatherPatArchiveService ihnGatherPatArchiveService;

 ruoyi-admin/src/main/resources/application-hzszlyy.yml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,219 @@
# æ•°æ®æºé…ç½®
spring:
  datasource:
    type: com.alibaba.druid.pool.DruidDataSource
    #    driverClassName: com.mysql.cj.jdbc.Driver
    druid:
      # ä¸»åº“数据源
      master:
        url: jdbc:mysql://192.169.129.197:3306/smartor?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
        username: smartor
        password: smartor
        driverClassName: com.mysql.cj.jdbc.Driver
      # ä»Žåº“数据源
      slave:
        enabled: true
        url: jdbc:oracle:thin:@//192.200.85.40:1521/hzsyhis?useUnicode=true&characterEncoding=GBK
        username: wssf
        password: Hzsywssf
        driver-class-name: oracle.jdbc.OracleDriver
      # åˆå§‹è¿žæŽ¥æ•°
      initialSize: 5
      # æœ€å°è¿žæŽ¥æ± æ•°é‡
      minIdle: 10
      # æœ€å¤§è¿žæŽ¥æ± æ•°é‡
      maxActive: 20
      # é…ç½®èŽ·å–连接等待超时的时间
      maxWait: 60000
      # é…ç½®é—´éš”多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
      timeBetweenEvictionRunsMillis: 60000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å°ç”Ÿå­˜çš„时间，单位是毫秒
      minEvictableIdleTimeMillis: 300000
      # é…ç½®ä¸€ä¸ªè¿žæŽ¥åœ¨æ± ä¸­æœ€å¤§ç”Ÿå­˜çš„时间，单位是毫秒
      maxEvictableIdleTimeMillis: 900000
      # é…ç½®æ£€æµ‹è¿žæŽ¥æ˜¯å¦æœ‰æ•ˆ
      validationQuery: SELECT 1 FROM DUAL
      #validationQuery: SELECT 1
      testWhileIdle: true
      testOnBorrow: false
      testOnReturn: false
      webStatFilter:
        enabled: true
      statViewServlet:
        enabled: false
        # è®¾ç½®ç™½åå•ï¼Œä¸å¡«åˆ™å…è®¸æ‰€æœ‰è®¿é—®
        allow:
        url-pattern: /druid/*
        # æŽ§åˆ¶å°ç®¡ç†ç”¨æˆ·åå’Œå¯†ç 
        login-username: lihu
        login-password: Lihu@1363419#$
      filter:
        stat:
          enabled: true
          # æ…¢SQL记录
          log-slow-sql: true
          slow-sql-millis: 1000
          merge-sql: true
        wall:
          config:
            multi-statement-allow: true
  # redis é…ç½®
  redis:
    host: 127.0.0.1
    port: 6379

    # æ•°æ®åº“索引
    database: 0
    # å¯†ç 
    password:
    # è¿žæŽ¥è¶…时时间
    timeout: 10s
    lettuce:
      pool:
        # è¿žæŽ¥æ± ä¸­çš„最小空闲连接
        min-idle: 0
        # è¿žæŽ¥æ± ä¸­çš„最大空闲连接
        max-idle: 8
        # è¿žæŽ¥æ± çš„最大数据库连接数
        max-active: 8
        # #连接池最大阻塞等待时间（使用负值表示没有限制）
        max-wait: -1ms

magic-api:
  web: /magic/web
  resource:
    type: database   # é…ç½®å­˜å‚¨åœ¨æ•°æ®åº“中
    tableName: magic_config  # æ•°æ®åº“中的表名
    prefix: /api
    readonly: false
  sql-column-case: camel
  show-sql: false #配置打印SQL
  page-config:
    size: size
    page: page
    default-page: 1
    default-size: 10

# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: false
  # è¯·æ±‚前缀
  pathMapping: /dev-api

#钉钉的密钥
dingAppid: dingn8iip5ubj7clrrsv
dingAppSecret: qlEK8D3oOVwGPOTiBQIBYTqQVlAfy9S_qQizEQFjJdSScwemWFryg4gbneu-NqWD


# websocket超时时间
server:
websocket:
timeout=60000:


accessKeyId: LTAI5tPfc1VJzz7VuhzcBwug
accessKeySecret: gG1srKxPFDBNWe2oHfqmK1qsSQkf1e
signName: æ­å·žåˆ©æ¹–科技

#智能呼叫(上海)
phoneIP: http://124.220.50.51
phonePort: 8001
#杭州
hzphoneIP: http://121.43.112.160
hzphonePort: 8088
#电话线路（1 ä¸Šæµ·ï¼Œ2 æ­å·žï¼‰
phonePath: 2
#自己的电话号码
phoneMySelf: 83234089
##授权 id(杭州)
#app_id: hzgs
##授权 key(已加密过的 key)(杭州)
#app_key: 605453540c4a0a692fe07e1cae1162f3
#授权 id(杭州)
app_id: hz_ali
#授权 key(已加密过的 key)(杭州)
app_key: a2f3b5799d635216aa280362fafd8c35


pub_key: MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALQzqW1EIXBKGMu+2oEYSB5gM7Ox/ihyYTeeoE0yPX1qtt4++5yNOeTBVd6EEM4iKzVEzWj6REIWVwaSNPn/SvUCAwEAAQ==
#这个是后端的私钥，用不到
pri_key: MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEAtDOpbUQhcEoYy77agRhIHmAzs7H+KHJhN56gTTI9fWq23j77nI055MFV3oQQziIrNUTNaPpEQhZXBpI0+f9K9QIDAQABAkB3n0fcWfrcoMN/FU3VnrnZOEF6CzFNxkgU9P8y36QECWKZ9JhYQkNpKrMC9oXlN3VSaRigV7B+L/I/a0Rs1W+tAiEA4jx7xcXJ4y4BNwAmVHt6NNiEkzIwWnwC/0qsEu8NsOsCIQDL6MMn1D2uznC6OuOWpxDCkBh1JL1NzZTZeH2G+hj7nwIgKGAC9tjFnvWm4dn0/T7MIIJDpsFeP8fCAS2iZ/6hwuECIAS/eLvWr1EAsZNEh8QcQ8GkBU3E+ztyjAK8UX/xFt/VAiBf79/1tDErX4/DChecM8w3c3DhbBcjuE3fHZn7p6/UKg==
#前端私钥（用不到了）
#pri_key: MIIBVQIBADANBgkqhkiG9w0BAQEFAASCAT8wggE7AgEAAkEApHTIe/StslZAT5Jzv8XClbrqox32pfaTrP5IOCRJ3FaH/UZsGgA/tsNBBEXq9eagqwPbJrjYfpdEtINcChrK4wIDAQABAkEAilDujdKshGGmlUZHs/NQRT6AOdDpsYxBiC4V76IVvQpw0IW6c4HGEvH4T+xRufika7/48L0eu0f06H+YtL5lgQIhANUd0a6oSsVxWifAjtKwMZcXD3OaIxQIQSCN4NT4VFY3AiEAxYxYrIhkIyg+UVw3WOSvBpXKxM4/WL9HRzkxDLvp2rUCIQCK23P8tgCJ5xJT5l3onw6goFDcBKkoazxsBqVgfjENPwIgWbuTd+OIYPPhwsE5ntZZrosSDO2GlsBkFzUiU59z7VUCIA0LL+9IFb+FWCl3DGTwIQ9SZYbv61T83LKjebUcSOfe

#二维码路径
qrpath: D:\qrcode

#公司内外链请求IP和端口号
#req_path: 8095
#localIP: 192.168.2.13

#新华医院外链请求IP和端口号
req_path: 8093
#localIP: https://wx.lihusmart.com
#丽水外链请求IP和端口号
localIP: http://221.12.19.26

#获取患者信息URL(华卓提供)
hosp_info_url: http://esb-core-rest.wowjoy.cn/esb/exchange

# 0代表走默认的上传    1 ä»£ç èµ°æ–°åŽåŒ»é™¢çš„上传
uploadSwitch: 0

#  æŒ‡å®šasr回调的url路径(本地)
ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
#挂断IP(本地)
hangup: http://192.168.100.6:8089/hangup
#fs所使用的阿里的app_key(本地)
app_key_yq: ZurNHpaQLq6P55YS

##  æŒ‡å®šasr回调的url路径(新华)
#ASRCallBackPath: http://192.168.101.135:8095/smartor/serviceSubtask/phoneCallBackYQ
##挂断IP(新华)
#hangup: http://192.16.4.220:8091/hangup
##fs所使用的阿里的app_key(新华)
#app_key_yq: ZurNHpaQLq6P55YS

#本 åœ° çŸ­ä¿¡è¯·æ±‚地址(这个服务是我们自己写的)
#xhsmsPath: http://192.168.2.13:8092/sendSms
#新华短信请求地址(这个服务是我们自己写的)
xhsmsPath: http://192.16.4.220:8092/sendSms
#帐号
xhsmsAccount: 911124
#接口密码
xhsmsPwd: zW5eXe
#虚拟接入码
xhsmsjrm: 1069055

##本地FTP连接
#FTP_SERVER: "192.168.2.13"
#FTP_USERNAME: voice
#FTP_PASSWORD: xh@2023

#新华FTP连接
FTP_SERVER: "192.16.4.220"
FTP_USERNAME: voice
FTP_PASSWORD: xh@2023

#语音地址访问前缀(新华)
voicePathPrefix: http://192.168.191.181:8095/profile/upload/vadio/
#语音地址访问前缀(公司)
#voicePathPrefix: http://192.168.2.13:8095/profile/upload/vadio/

#第个小时电话拨打的上限
phoneUpEveryHour: 12
#电话每天结束时间
phoneEndHour: 20

#新员工默认密码
defaultPwd: 123456

#是否需要根据疾病建立出院患者随访
createIcd10Visit: false

#admin管理员userId
isAdmin: 1,2,3,4,5,6,7,8,9,10,11,12,13

#随访医院：1新华   2丽水
visitHosp: 2

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java

@@ -192,8 +192,24 @@
    public Integer selectIcd10List(Icd10 icd10) {
        List<Icd10> icd10s = chMapper.selectIcd10List(icd10);
        log.info("selectIcd10List的采集到的数量为：{}", icd10s.size());
        int i = icd10Mapper.batchIcd10(icd10s);
        return i;
        int size = 0;
        if (icd10s.size() > 500) {
            int i = icd10s.size() / 500;
            for (int a = 0; a < i + 1; a++) {
                if (a >= 0 && a < i) {
                    List<Icd10> icd10Temp = icd10s.subList(a * 500, (a + 1) * 500);
                    size += icd10Mapper.batchIcd10(icd10Temp);
                } else {
                    List<Icd10> icd10Temp = icd10s.subList(i * 500, icd10s.size());
                    if (icd10Temp != null && icd10Temp.size() != 0) {
                        size += icd10Mapper.batchIcd10(icd10Temp);
                    }
                }
            }
        } else {
            size += icd10Mapper.batchIcd10(icd10s);
        }
        return size;
    }

    @Override

 ruoyi-quartz/src/main/resources/mapper/quartz/CollectHISMapper.xml

@@ -365,16 +365,16 @@

    <select id="yhyjsxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserRoleResult">
        select user_id, role_id, orgid
        FROM yhyjsxx
        FROM healthy_user_role
        <where>
            <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
        </where>
    </select>

    <select id="yhyksxx" parameterType="com.ruoyi.common.core.domain.entity.SysUser" resultMap="SysUserDeptResult">
        select user_id, user_code, dept_type,department_id as
        dept_id,dept_name,deptparent,del_flag,orgid,create_time,create_by,update_time,update_by
        FROM yhyksxx
        select user_id, user_code, dept_type,dept_code as
        dept_id,dept_name,deptparent,del_flag,orgid
        FROM healthy_user_dept
        <where>
            user_id != 'admin'
            <if test="hisUserId != null ">and user_id = #{hisUserId}</if>
@@ -627,6 +627,7 @@
               d.email,
               d.status,
               d.his_dept_id,
               d.orgid,
               d.his_parent_id
        FROM healthy_dept d


 smartor/src/main/java/com/smartor/domain/PatMedOuthosp.java

@@ -226,5 +226,9 @@
    @Excel(name = " è¯ä»¶å·ç  ")
    private String idcardno;

    @ApiModelProperty(value = "是否有随访0没有;>=1有随访 ")
    private String serverState;



}

 smartor/src/main/java/com/smartor/domain/SvyLibTemplateScriptVO.java

@@ -271,5 +271,7 @@
    @ApiModelProperty("题目结果ID(service_subtask_detail里的主键)")
    private String scriptResultId;

    @ApiModelProperty("选项答案的附加信息")
    private String answerps;

}

 smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java

@@ -402,6 +402,8 @@
                        if (StringUtils.isNotEmpty(scriptResult.get("asrtext")))
                            svyLibTemplateScriptVO.setScriptResult(StringUtils.isNotEmpty(scriptResult.get("asrtext")) ? scriptResult.get("asrtext").replaceAll("^(\"|')(.*)\\1$", "$2") : "");
                        svyLibTemplateScriptVO.setScriptResultId(scriptResult.get("asrtextId"));
                        if (StringUtils.isNotEmpty(scriptResult.get("answerps")))
                            svyLibTemplateScriptVO.setAnswerps(scriptResult.get("answerps"));
                    }
                }
                map.put("scriptResult", svyLibTemplateScriptVOList);
@@ -427,6 +429,7 @@
        if (CollectionUtils.isNotEmpty(serviceSubtaskDetails)) {
            map.put("asrtext", serviceSubtaskDetails.get(0).getAsrtext());
            map.put("asrtextId", serviceSubtaskDetails.get(0).getId());
            map.put("answerps", serviceSubtaskDetails.get(0).getAnswerps());
            return map;
        }
        return null;

 smartor/src/main/resources/mapper/smartor/PatMedOuthospMapper.xml

@@ -113,8 +113,11 @@
        pmo.hpi,
        pmo.fuflag,
        pmo.patname,
        pmo.mainsuit
        from pat_med_outhosp pmo
        CONCAT(pa.age,pa.age_unit,pa.age2,pa.age_unit2) AS age,
        pa.telcode,
        pmo.mainsuit,
        pa.idcardno
        from pat_med_outhosp pmo left join pat_archive pa on pmo.patid = pa.id
        <where>
            pmo.del_flag=0
            <if test="orgid != null ">and pmo.orgid = #{orgid}</if>
@@ -132,7 +135,6 @@
                date_format(#{endTime},'%y%m%d')
            </if>
            <if test="patid != null ">and pmo.patid = #{patid}</if>
            <if test="serialnum != null ">and pmo.serialnum = #{serialnum}</if>
            <if test="fuflag != null ">and pmo.fuflag = #{fuflag}</if>
            <if test="patno != null ">and pmo.patno = #{patno}</if>
            <if test="outhospno != null  and outhospno != ''">and pmo.outhospno = #{outhospno}</if>

 smartor/src/main/resources/mapper/smartor/ServiceSubtaskDetailMapper.xml

@@ -54,7 +54,6 @@
        <result property="patid" column="patid"/>
        <result property="guid" column="guid"/>
        <result property="extemplateText" column="extemplate_text"/>
        <result property="answerps" column="answerps"/>
    </resultMap>
    <resultMap type="com.smartor.domain.ServiceSubtaskDetailTarget" id="ServiceSubtaskDetailTargetResult">
        <result property="targetid" column="targetid"/>
@@ -112,8 +111,7 @@
               update_by,
               update_time,
               value_type,
               create_by,
               answerps
               create_by
        from service_subtask_detail
    </sql>