需求修改

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

@@ -11,7 +11,7 @@ ruoyi:
     # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
     profile: /home/boman/xinyong
     #文件上传的激活前缀
-    pathMapping: http://47.99.82.249:6000/prod-api
+    pathMapping: http://192.168.3.102:6000/prod-api
     # 获取ip地址开关
     addressEnabled: false
     # 验证码类型 math 数组计算 char 字符验证
@@ -24,9 +24,10 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/qianshan_nucleic_contrast?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.3.101:3306/qianshan_nucleic_contrast?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: zhaoshang@2018
+                #password: zhaoshang@2018
+                password: YeRq#zd%MQ
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -76,13 +77,13 @@ spring:
     # redis 配置
     redis:
         # 地址
-        host: 127.0.0.1
+        host: 192.168.3.101
         # 端口，默认为6379
         port: 6379
         # 数据库索引
         database: 9
         # 密码
-        password: D3fQYAsw
+        password: 3r263Tr$
         # 连接超时时间
         timeout: 10s
         lettuce:

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java

@@ -189,6 +189,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
 
         int index = 0;
         int count = 0;
+        String PhoneNum = "";
         for (UserInfo userInfo : userList) {
 
             System.out.println("我在循环");
@@ -235,6 +236,10 @@ public class UserInfoServiceImpl implements IUserInfoService {
                                 index++;
                             }
                         }*/
+                        if(StringUtils.isEmpty(PhoneNum)){
+                            PhoneNum = odsQssHsjcxx.getSjhm();
+                        }
+
 
                         if (StringUtils.isNotEmpty(collectPlace.toString())) {
                             collectPlace.append("<br>");
@@ -256,9 +261,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
                         }
                         if(StringUtils.isEmpty(odsQssHsjcxx.getJcjg())){
                             nucleicResults.append(odsQssHsjcxx.getJcjg());
-                        }else if("0".equals(odsQssHsjcxx.getJcjg())){
+                        }else if("0".equals(odsQssHsjcxx.getJcjg()) || "negative".equals(odsQssHsjcxx.getJcjg())){
                             nucleicResults.append("阴性");
-                        }else if("1".equals(odsQssHsjcxx.getJcjg())){
+                        }else if("1".equals(odsQssHsjcxx.getJcjg()) || "positive".equals(odsQssHsjcxx.getJcjg())){
                             nucleicResults.append("阳性");
                         }else{
                             nucleicResults.append(odsQssHsjcxx.getJcjg());
@@ -271,13 +276,13 @@ public class UserInfoServiceImpl implements IUserInfoService {
             if (index < Integer.parseInt(detectionNumber)) {
                 bl = false;
             }
-
+            userInfo.setPhoneNum(OdsQssHsjcxxList.get(0).getSjhm());
             userInfo.setCollectPlace(collectPlace.toString());
             userInfo.setNucleicCollectTime(nucleicCollectTime.toString());
             userInfo.setNucleicResultsTime(nucleicResultsTime.toString());
             userInfo.setNucleicResults(nucleicResults.toString());
             userInfo.setDetectionProgress(index + "/" + detectionNumber);
-
+            PhoneNum = "";
 
             if (bl) {
                 userInfo.setDetectionResult("正常");
@@ -396,9 +401,9 @@ public class UserInfoServiceImpl implements IUserInfoService {
                 }
                 if(StringUtils.isEmpty(odsQssHsjcxx.getJcjg())){
                     nucleicResults.append(odsQssHsjcxx.getJcjg());
-                }else if("0".equals(odsQssHsjcxx.getJcjg())){
+                }else if("0".equals(odsQssHsjcxx.getJcjg()) || "negative".equals(odsQssHsjcxx.getJcjg())){
                     nucleicResults.append("阴性");
-                }else if("1".equals(odsQssHsjcxx.getJcjg())){
+                }else if("1".equals(odsQssHsjcxx.getJcjg()) || "positive".equals(odsQssHsjcxx.getJcjg())) {
                     nucleicResults.append("阳性");
                 }else{
                     nucleicResults.append(odsQssHsjcxx.getJcjg());

ruoyi-system/src/main/resources/mapper/system/UserInfoMapper.xml

@@ -250,13 +250,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="thirdNucleicAcid" resultType="com.ruoyi.system.domain.OdsQssHsjcxx">
         select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
+        from ( select sfzhm,xm,sjhm,cjsj,jgcjss,jcdd,jcjg,sjly
         from ods_qss_hsjcxx_all
         where cjsj > #{startTime}  and #{endTime}>=cjsj
         and sfzhm in
         <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
             #{idCard}
         </foreach>
-        order by cjsj desc
+
+        UNION
+
+        SELECT s.id_card_no as sfzhm,
+               s.user_name as xm,
+               s.user_phone as sjhm,
+               s.collect_datetime as cjsj,
+               testing_datetime as jgcjsj,
+               s.collect_site_name as jcdd,
+               sign_name as jcjg,
+               c.town as sjly
+        FROM `tb_whole_testing_sample_921`  s
+        LEFT JOIN tb_whole_testing_result_921 r on s.id = r.id
+        LEFT JOIN tb_whole_collect_site_city c on s.collect_site_code = c.id
+        where s.collect_datetime > #{startTime}  and #{endTime}>=s.collect_datetime
+        and s.id_card_no in
+        <foreach item="idCard" collection="idCardList" open="(" separator="," close=")">
+            #{idCard}
+        </foreach>
+        ) a
+        order by a.cjsj;
     </select>
 
+
+
 </mapper>