jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 24a944196709371ffbea01923be00c430ab24b04

Authored by [wangbo]
1 parent 8a242c3320
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

高危转诊bug修改

Showing 1 changed file with 28 additions and 22 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 24a9441
... ... @@ -40,8 +40,8 @@
40 40 @Component
41 41 public class ApplyOrderFacade {
42 42 public static final String HUADA_URL = PropertiesUtils.getPropertyValue("huada_url");
43   - public static final String SYSCODE = PropertiesUtils.getPropertyValue("huada_syscode");
44   - public static final String SECRET = PropertiesUtils.getPropertyValue("huada_secret");
  43 + public static final String SYSCODE = PropertiesUtils.getPropertyValue("huada_syscode");
  44 + public static final String SECRET = PropertiesUtils.getPropertyValue("huada_secret");
45 45  
46 46 @Autowired
47 47 private ApplyOrderService applyOrderService;
... ... @@ -1268,6 +1268,7 @@
1268 1268 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
1269 1269 //转入医院
1270 1270 referralApplyOrderQuery.setTransferredHospital(hospitalId);
  1271 + referralApplyOrderQuery.setHospitalId(hospitalId);
1271 1272 referralApplyOrderQuery.setStatus(1);
1272 1273 List<Map<String, Object>> message = new ArrayList<>();
1273 1274 List<BabyApplyOrderResult> babyApplyOrderResults = new ArrayList<>();
... ... @@ -1276,7 +1277,8 @@
1276 1277 if ("0".equals(type)) {
1277 1278 //查询24小时内的消息数据
1278 1279 referralApplyOrderQuery.setTransferredStart(DateUtil.addDay(new Date(), -1));
1279   - referralApplyOrderQuery.setTransferredEnd(new Date());
  1280 + //referralApplyOrderQuery.setTransferredEnd(new Date());
  1281 + //System.out.println(referralApplyOrderQuery.convertToQuery().convertToMongoQuery().toString());
1280 1282 int cout = applyOrderService.queryCount(referralApplyOrderQuery);
1281 1283 if (cout > 0) {
1282 1284 messageMap.put("count", cout);
... ... @@ -1366,6 +1368,7 @@
1366 1368 }
1367 1369 return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
1368 1370 }
  1371 +
1369 1372 public BaseResponse addOneSieveApplyOrder_huada(SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada, Integer userId) {
1370 1373 SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel = sieveApplyOrderAddRequestHuada.convertToDataModel();
1371 1374 //修改这块占时不写
1372 1375  
1373 1376  
... ... @@ -1402,16 +1405,16 @@
1402 1405 //调用华大基因接口
1403 1406 sieveApplyOrderHuadaModel.setExtBaseInfoId(sieveApplyOrderHuadaModel1.getId());
1404 1407 boolean b = huadaSaveSampleInfo(sieveApplyOrderHuadaModel);
1405   - if(b){
  1408 + if (b) {
1406 1409 System.out.println("华大基因5.1.保存送检单成功");
1407 1410 //华大基因产筛申请，保存成功后在改变产筛状态
1408 1411 //产前产筛状态，等看看设计这块有没有这块需求
1409 1412 // updateSieveStatus(sieveApplyOrderAddRequestHuada, userId, sieveApplyOrderHuadaModel, hospitalId);
1410 1413  
1411   - }else {
  1414 + } else {
1412 1415 operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderHuadaModel, OptActionEnums.ADD.getId(), "华大基因5.1.保存送检单失败");
1413 1416 }
1414   - }else {
  1417 + } else {
1415 1418 return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛");
1416 1419 }
1417 1420 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
... ... @@ -1419,8 +1422,8 @@
1419 1422 }
1420 1423  
1421 1424 private String getWeeks(String str) {
1422   - String s1=null;
1423   - s1 = str.replace("孕", "");
  1425 + String s1 = null;
  1426 + s1 = str.replace("孕", "");
1424 1427 s1 = s1.replace("周", "w");
1425 1428 s1 = s1.replace("天", "");
1426 1429 return s1;
... ... @@ -1447,8 +1450,7 @@
1447 1450 sieveQuery.setYn(YnEnums.YES.getId());
1448 1451 sieveQuery.setParentId(sieveApplyOrderAddRequestHuada.getParentId());
1449 1452 List<SieveModel> sieveModels = sieveService.queryList(sieveQuery);
1450   - if (CollectionUtils.isNotEmpty(sieveModels))
1451   - {
  1453 + if (CollectionUtils.isNotEmpty(sieveModels)) {
1452 1454 SieveModel sieveModel = sieveModels.get(0);
1453 1455 sieveModel.setReviceStatus(1);
1454 1456 sieveModel.setSieveHospitalId(sieveApplyOrderAddRequestHuada.getSieveHospitalId());
... ... @@ -1467,7 +1469,7 @@
1467 1469 }
1468 1470  
1469 1471  
1470   - public boolean huadaSaveSampleInfo(Object o){
  1472 + public boolean huadaSaveSampleInfo(Object o) {
1471 1473 try {
1472 1474 ArrayList<AllParamsRequest> paramsList = new ArrayList();
1473 1475 AllParamsRequest paramsRequest = new AllParamsRequest();
1474 1476  
... ... @@ -1484,12 +1486,12 @@
1484 1486 timestamp = timestamp.replaceAll(" ", "%20");//空格替换成 %20
1485 1487 String syscode = signParams.get("syscode").toString();
1486 1488 String sign = signParams.get("sign").toString();
1487   - String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&"+ "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map);
  1489 + String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&" + "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map);
1488 1490 System.out.println(s);
1489 1491 JSONObject jsonObject = JSONObject.parseObject(s);
1490 1492 JSONObject rows = JSONObject.parseObject(jsonObject.get("rows").toString());
1491 1493 JSONArray jsonArray = JSONArray.parseArray(rows.get("successedList").toString());
1492   - if (jsonArray.isEmpty()){
  1494 + if (jsonArray.isEmpty()) {
1493 1495 return false;
1494 1496 }
1495 1497 return true;
1496 1498  
1497 1499  
1498 1500  
1499 1501  
... ... @@ -1501,23 +1503,26 @@
1501 1503  
1502 1504 /**
1503 1505 * 获取签名map
  1506 + *
1504 1507 * @param syscode 系统编码
1505 1508 * @param secret 系统秘钥
1506 1509 * @return
1507 1510 */
1508   - public static Map<String, Object> getSignParams(String syscode,String secret) {
1509   - Map<String, Object> signParams=new HashMap<>();
  1511 + public static Map<String, Object> getSignParams(String syscode, String secret) {
  1512 + Map<String, Object> signParams = new HashMap<>();
1510 1513 signParams.put("syscode", syscode);
1511 1514 SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
1512 1515 signParams.put("timestamp", sdf.format(new Date()));
1513   - String unencryptedStr=getUnencryptedStr(signParams);
1514   - String sign2=MD5.getMD5(secret+unencryptedStr+secret);//获取数字签名
1515   - System.out.println("sign2 "+sign2);
  1516 + String unencryptedStr = getUnencryptedStr(signParams);
  1517 + String sign2 = MD5.getMD5(secret + unencryptedStr + secret);//获取数字签名
  1518 + System.out.println("sign2 " + sign2);
1516 1519 signParams.put("sign", sign2);
1517 1520 return signParams;
1518 1521 }
  1522 +
1519 1523 /**
1520 1524 * 获取待加密字符串
  1525 + *
1521 1526 * @param signParams
1522 1527 * @return
1523 1528 */
1524 1529  
... ... @@ -1543,11 +1548,12 @@
1543 1548 System.out.println(jsonObject);
1544 1549 return null;
1545 1550 }
  1551 +
1546 1552 /*拼json使用*/
1547   - class AllParamsRequest{
1548   - private String productLine;
1549   - private String identifying;
1550   - private Object sampleInfo;
  1553 + class AllParamsRequest {
  1554 + private String productLine;
  1555 + private String identifying;
  1556 + private Object sampleInfo;
1551 1557  
1552 1558 public String getIdentifying() {
1553 1559 return identifying;