jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 05728718f3a9513584d7157c46f35df76bd83ac3

Authored by yangfei
2 parents 8a21b15b2d bf2f6a2f52
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ 0572871
... ... @@ -281,34 +281,19 @@
281 281 * 处理产后复查、产后追访数据显示及自动流转
282 282 */
283 283 public void dandleAutoReachDue() {
284   - //处理产筛20周自动流转数据
285 284 new Thread(new Runnable() {
286 285 @Override
287 286 public void run() {
  287 + //处理产筛20周自动流转数据
288 288 handSieveTrack();
289   - }
290   - }).start();
291 289  
292   - //处理产后复查、产后追访数据显示及自动流转
293   - new Thread(new Runnable() {
294   - @Override
295   - public void run() {
  290 + //处理产后复查、产后追访数据显示及自动流转
296 291 patientAutoFm();
297   - }
298   - }).start();
299 292  
300   - //自动流转产后复查转出或产后访视转出
301   - new Thread(new Runnable() {
302   - @Override
303   - public void run() {
  293 + //自动流转产后复查转出或产后访视转出
304 294 trackAutoFlow();
305   - }
306   - }).start();
307 295  
308   - //自动流转产后复查转出或产后访视转出
309   - new Thread(new Runnable() {
310   - @Override
311   - public void run() {
  296 + //自动流转产后复查转出或产后访视转出
312 297 dandleReachDue();
313 298 }
314 299 }).start();
platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/MsgGenerateServiceImpl.java View file @ 0572871
... ... @@ -208,7 +208,7 @@
208 208  
209 209 List<CourseModel> courseModels = courseService.queryCourseList(query);
210 210  
211   - logger.info("The generateCourseMsg configs hospital size is {}",courseModels.size());
  211 + logger.info("The generateCourseMsg courses hospital size is {}",courseModels.size());
212 212 if (CollectionUtils.isNotEmpty(courseModels))
213 213 {
214 214 int end = 0;
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/CourseMsgGenerateWorker.java View file @ 0572871
... ... @@ -74,7 +74,7 @@
74 74  
75 75 String hospitalId = course.getHospitalId();
76 76  
77   - logger.info("genernate course hospital id = "+hospitalId);
  77 + logger.info("genernate course hospital id = "+hospitalId +";courseName="+course.getCourseName());
78 78 if (StringUtils.isEmpty(hospitalId))
79 79 {
80 80 continue;
... ... @@ -123,7 +123,7 @@
123 123 PatientsQuery patientsQuery = new PatientsQuery();
124 124 patientsQuery.setYn(YnEnums.YES.getId());
125 125 patientsQuery.setHospitalId(course.getHospitalId());
126   - patientsQuery.setLimit(2);
  126 + patientsQuery.setLimit(2000);
127 127 int count = 1;
128 128 while (true)
129 129 {
130 130  
... ... @@ -170,13 +170,12 @@
170 170 break;
171 171 }
172 172 count++;
173   - Thread.sleep(2000);
174 173 }
175 174 list.setMessages(messages);
176 175 HelperUtils.sendMsg(list);
177 176 course.setIsSend(1);
178 177 courseService.updateCourse(course);
179   - } catch (InterruptedException e) {
  178 + } catch (Exception e) {
180 179 logger.info("generateYun error." + course);
181 180 }
182 181 }
... ... @@ -190,7 +189,7 @@
190 189 PatientsQuery patientsQuery = new PatientsQuery();
191 190 patientsQuery.setYn(YnEnums.YES.getId());
192 191 patientsQuery.setHospitalId(course.getHospitalId());
193   - patientsQuery.setLimit(2);
  192 + patientsQuery.setLimit(1000);
194 193 int count = 1;
195 194 while (true)
196 195 {
197 196  
... ... @@ -232,13 +231,12 @@
232 231 break;
233 232 }
234 233 count++;
235   - Thread.sleep(2000);
236 234 }
237 235 list.setMessages(messages);
238 236 HelperUtils.sendMsg(list);
239 237 course.setIsSend(1);
240 238 courseService.updateCourse(course);
241   - } catch (InterruptedException e) {
  239 + } catch (Exception e) {
242 240 logger.info("generateChan error."+course);
243 241 }
244 242 }
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ 0572871
1 1 package com.lyms.hospitalapi.Cdfy;
2 2  
  3 +import com.lyms.hospitalapi.pojo.HealthRecord;
3 4 import com.lyms.platform.pojo.Patients;
4 5 import org.springframework.stereotype.Service;
5 6  
6 7  
... ... @@ -10,12 +11,24 @@
10 11 @Service("cdGwInterface")
11 12 public class CdGwInterface {
12 13  
13   - //保存孕妇建档（更新健康档案）
  14 + //保存孕妇建档（更新健康档案暂时不支持）
14 15 private static String jdUrl = "http://gxgg.greatsoft.net:8083/maternal/personInfo/savePersonInfo";
15 16  
16 17  
17 18 public String saveRecord(Patients patient,String hosipitalId){
18 19  
  20 + HealthRecord HealthRecord = new HealthRecord();
  21 + HealthRecord.setPersonInfoId("");
  22 + HealthRecord.setName("");
  23 + HealthRecord.setPinYinStr("无");
  24 + HealthRecord.setIdNo(patient.getCardNo());
  25 + HealthRecord.setTelNo(patient.getPhone());
  26 +
  27 +
  28 + HealthRecord.setIsAppCreate("9");
  29 + HealthRecord.setRemarks("无");
  30 + HealthRecord.setModifier("");
  31 + HealthRecord.setModifierId("");
19 32  
20 33  
21 34 return null;
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/HealthRecord.java View file @ 0572871
... ... @@ -61,7 +61,7 @@
61 61 private String modifierId;//最后修改人ID
62 62 private String modifier;//最后修改人
63 63 private String remarks;//备注
64   - private String isAppCreate="9";//上传标识
  64 + private String isAppCreate;//上传标识
65 65  
66 66  
67 67 public String getPersonInfoId() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java View file @ 0572871
... ... @@ -187,6 +187,7 @@
187 187 } catch (Exception e) {
188 188 writeString(response, "execSyncMysqlData fail");
189 189 ExceptionUtils.catchException(e, "execSyncMysqlData fail");
  190 + return;
190 191 }
191 192 writeString(response, "success");
192 193 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java View file @ 0572871
... ... @@ -12,6 +12,7 @@
12 12 import org.springframework.beans.factory.annotation.Autowired;
13 13 import org.springframework.stereotype.Component;
14 14  
  15 +import java.io.UnsupportedEncodingException;
15 16 import java.util.HashSet;
16 17 import java.util.Set;
17 18 import java.util.concurrent.BlockingQueue;
... ... @@ -56,9 +57,13 @@
56 57 {
57 58 SqlRequest request = new SqlRequest();
58 59 request.setSql(sql);
59   - request.setSqlId(sqlId);
60   - syncSqlQueue.add(request);
61   - System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
  60 + try {
  61 + request.setSqlId(Base64.encodeBase64String(sqlId.getBytes("utf-8")));
  62 + syncSqlQueue.add(request);
  63 + System.out.println("syncSqlQueue size = " + syncSqlQueue.size());
  64 + } catch (UnsupportedEncodingException e) {
  65 + e.printStackTrace();
  66 + }
62 67 }
63 68  
64 69  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/CourseCountWorker.java View file @ 0572871
... ... @@ -56,26 +56,20 @@
56 56 courseTypeQuery.setHospitalId(hospitalId);
57 57 courseTypeQuery.setYn(YnEnums.YES.getId());
58 58  
59   -
60   - PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
61   - patientCourseQuery.setYn(YnEnums.YES.getId());
62   - patientCourseQuery.setHospitalId(hospitalId);
63   -
64 59 for (CourseModel courseModel : courseModelList)
65 60 {
66 61 Map<String,String> topmap = new HashMap();
67 62  
68 63 topmap.put("courseId",courseModel.getId());
69 64  
70   - patientCourseQuery.setCourseId(courseModel.getId());
71 65 topmap.put("title", courseModel.getCourseName());
72 66  
73   - patientCourseQuery.setStatus(1);
74   - int courseOrders = patientCourseService.queryPatientCourseCount(patientCourseQuery);
  67 + //int courseOrders = patientCourseService.queryPatientCourseCount(patientCourseQuery);
  68 + int courseOrders = courseModel.getEnrolmentNum() == null ? 0 : courseModel.getEnrolmentNum();
75 69 topmap.put("order", String.valueOf(courseOrders));
76 70  
77   - patientCourseQuery.setStatus(2);
78   - int courseSigns = patientCourseService.queryPatientCourseCount(patientCourseQuery);
  71 +// int courseSigns = patientCourseService.queryPatientCourseCount(patientCourseQuery);
  72 + int courseSigns = courseModel.getSignNum() == null ? 0 : courseModel.getSignNum();
79 73 topmap.put("courseSigns", String.valueOf(courseSigns));
80 74  
81 75 int courseSends = MessageCenterService.getCourseCountData(hospitalId, String.valueOf(SmsServiceEnums.YFXXKCTX.getId()), 3,
platform-operate-api/src/main/resources/mybatis.xml View file @ 0572871
... ... @@ -19,11 +19,11 @@
19 19 <!--</plugin>-->
20 20 <!--</plugins>-->
21 21  
22   - <plugins>
23   - <plugin interceptor="com.lyms.platform.operate.web.inteceptor.MysqlDataInterceptor">
24   - <property name="dialect" value="mysql"/>
25   - </plugin>
26   - </plugins>
  22 + <!--<plugins>-->
  23 + <!--<plugin interceptor="com.lyms.platform.operate.web.inteceptor.MysqlDataInterceptor">-->
  24 + <!--<property name="dialect" value="mysql"/>-->
  25 + <!--</plugin>-->
  26 + <!--</plugins>-->
27 27  
28 28 </configuration>