jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 3b78bc8a0eec1ccffc13c1606a665587687a3313

Authored by jiangjiazhi
2 parents 7dabb9967b 819f7df9d9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ 3b78bc8
... ... @@ -26,7 +26,7 @@
26 26  
27 27 //String encrypt = aesEncrypt("com.lyms.platform.pojo.PatientWeight", key); System.out.println("加密后：" + encrypt);
28 28  
29   - String json = aesDecrypt("8A915B4A1B26D283EF1981BE0BCE6E78967C3065177F856709C3E1C9BC35AAB19153BB512619EB7FCA97377FE682CAA9", key);
  29 + String json = aesDecrypt("26EB0301C4A2410E90985A3E55856E4B394230836B32B93AD3C083D37C3C4E0BEA7B0DB8B7C18941599742DD2315584A", key);
30 30 System.out.println("解密后：" + json);
31 31  
32 32 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 3b78bc8
... ... @@ -1935,11 +1935,23 @@
1935 1935 // }
1936 1936  
1937 1937  
1938   - @RequestMapping(value = "/his/getClFyIdByVcCardNo")
  1938 + @RequestMapping(value = "/his/getLcdcfyHis")
1939 1939 @ResponseBody
1940   - public Map<String, Object> getLcdcfyByZyhHis(@RequestParam("vcCardNo") String vcCardNo) {
  1940 + public Map<String,Object> getLcdcfyByZyhHis(@RequestParam("vcCardNo") String vcCardNo) {
  1941 + List<Map> list = new ArrayList<>();
  1942 + Map<String,String> data = new HashMap<>();
  1943 + data.put("id","1114536");
  1944 + data.put("vcCardNo","0000660411");
  1945 + data.put("name","张三");
  1946 + data.put("sex","女");
  1947 + data.put("birthday","2000-11-06");
  1948 + data.put("bhnum","54345");
  1949 + data.put("phone","15622222222");
  1950 + data.put("idCard","371525200011062385");
  1951 + list.add(data);
1941 1952 Map<String, Object> map = new HashMap<String, Object>();
1942   - map.put("id", "1236544");
  1953 + map.put("hisPatient", list);
  1954 +
1943 1955 return map;
1944 1956 }
1945 1957  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ 3b78bc8
... ... @@ -2746,6 +2746,10 @@
2746 2746 {
2747 2747 antExChuQuery.setParentId(patients.getId());
2748 2748 }
  2749 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2750 + {
  2751 + antExChuQuery.setParentId(patients.getId());
  2752 + }
2749 2753 else
2750 2754 {
2751 2755 antExChuQuery.setPid(patients.getPid());
... ... @@ -2760,7 +2764,6 @@
2760 2764 }
2761 2765 antExChuQuery.setStart(max);
2762 2766  
2763   - // System.out.println("初诊查询："+antExChuQuery.convertToQuery().convertToMongoQuery());
2764 2767 //获取初诊记录
2765 2768 List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
2766 2769  
... ... @@ -2775,6 +2778,10 @@
2775 2778 {
2776 2779 antExQuery.setParentId(patients.getId());
2777 2780 }
  2781 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2782 + {
  2783 + antExQuery.setParentId(patients.getId());
  2784 + }
2778 2785 else
2779 2786 {
2780 2787 antExQuery.setPid(patients.getPid());
2781 2788  
... ... @@ -2797,11 +2804,14 @@
2797 2804 antExQuery1.setHospitalId(hospitalId);
2798 2805  
2799 2806 //http://jira.healthbaby.com.cn/browse/WEB-2733
2800   -
2801 2807 if (StringUtils.isNotEmpty(queryRequest.getVcCardNo()) && StringUtils.isEmpty(queryRequest.getCardNo()))
2802 2808 {
2803 2809 antExQuery1.setParentId(patients.getId());
2804 2810 }
  2811 + else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon()))
  2812 + {
  2813 + antExQuery1.setParentId(patients.getId());
  2814 + }
2805 2815 else
2806 2816 {
2807 2817 antExQuery1.setPid(patients.getPid());
... ... @@ -2810,7 +2820,6 @@
2810 2820  
2811 2821 antExQuery1.setYn(YnEnums.YES.getId());
2812 2822 antExQuery1.setStart(max);
2813   - // System.out.println("复诊查询："+antExQuery1.convertToQuery().convertToMongoQuery());
2814 2823 List<AntenatalExaminationModel> examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
2815 2824  
2816 2825 String lastTime = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntenatalExaminationQueryRequest.java View file @ 3b78bc8
... ... @@ -25,6 +25,16 @@
25 25  
26 26 private String barCode;
27 27  
  28 + private String coupon;
  29 +
  30 + public String getCoupon() {
  31 + return coupon;
  32 + }
  33 +
  34 + public void setCoupon(String coupon) {
  35 + this.coupon = coupon;
  36 + }
  37 +
28 38 public String getBarCode() {
29 39 return barCode;
30 40 }
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 3b78bc8
... ... @@ -282,7 +282,7 @@
282 282 </bean>
283 283  
284 284  
285   - <!-- 孕妇学校定时任务 -->
  285 + <!-- 血压定时任务 -->
286 286 <bean id="generateBpReport" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
287 287 <!-- 要调用的bean -->
288 288 <property name="targetObject" ref="bloodPressureServiceImpl"></property>