diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index ae60bd5..82567ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -40,8 +40,8 @@ import java.util.*; @Component public class ApplyOrderFacade { public static final String HUADA_URL = PropertiesUtils.getPropertyValue("huada_url"); - public static final String SYSCODE = PropertiesUtils.getPropertyValue("huada_syscode"); - public static final String SECRET = PropertiesUtils.getPropertyValue("huada_secret"); + public static final String SYSCODE = PropertiesUtils.getPropertyValue("huada_syscode"); + public static final String SECRET = PropertiesUtils.getPropertyValue("huada_secret"); @Autowired private ApplyOrderService applyOrderService; @@ -1268,6 +1268,7 @@ public class ApplyOrderFacade { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); //转入医院 referralApplyOrderQuery.setTransferredHospital(hospitalId); + referralApplyOrderQuery.setHospitalId(hospitalId); referralApplyOrderQuery.setStatus(1); List> message = new ArrayList<>(); List babyApplyOrderResults = new ArrayList<>(); @@ -1276,7 +1277,8 @@ public class ApplyOrderFacade { if ("0".equals(type)) { //查询24小时内的消息数据 referralApplyOrderQuery.setTransferredStart(DateUtil.addDay(new Date(), -1)); - referralApplyOrderQuery.setTransferredEnd(new Date()); + //referralApplyOrderQuery.setTransferredEnd(new Date()); + //System.out.println(referralApplyOrderQuery.convertToQuery().convertToMongoQuery().toString()); int cout = applyOrderService.queryCount(referralApplyOrderQuery); if (cout > 0) { messageMap.put("count", cout); @@ -1366,6 +1368,7 @@ public class ApplyOrderFacade { } return new BaseObjectResponse().setData("").setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + public BaseResponse addOneSieveApplyOrder_huada(SieveApplyOrderAddRequestHuada sieveApplyOrderAddRequestHuada, Integer userId) { SieveApplyOrderHuadaModel sieveApplyOrderHuadaModel = sieveApplyOrderAddRequestHuada.convertToDataModel(); //修改这块占时不写 @@ -1402,16 +1405,16 @@ public class ApplyOrderFacade { //调用华大基因接口 sieveApplyOrderHuadaModel.setExtBaseInfoId(sieveApplyOrderHuadaModel1.getId()); boolean b = huadaSaveSampleInfo(sieveApplyOrderHuadaModel); - if(b){ + if (b) { System.out.println("华大基因5.1.保存送检单成功"); //华大基因产筛申请,保存成功后在改变产筛状态 //产前产筛状态,等看看设计这块有没有这块需求 // updateSieveStatus(sieveApplyOrderAddRequestHuada, userId, sieveApplyOrderHuadaModel, hospitalId); - }else { + } else { operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), sieveApplyOrderHuadaModel, OptActionEnums.ADD.getId(), "华大基因5.1.保存送检单失败"); } - }else { + } else { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("已申请过产筛"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -1419,8 +1422,8 @@ public class ApplyOrderFacade { } private String getWeeks(String str) { - String s1=null; - s1 = str.replace("孕", ""); + String s1 = null; + s1 = str.replace("孕", ""); s1 = s1.replace("周", "w"); s1 = s1.replace("天", ""); return s1; @@ -1447,8 +1450,7 @@ public class ApplyOrderFacade { sieveQuery.setYn(YnEnums.YES.getId()); sieveQuery.setParentId(sieveApplyOrderAddRequestHuada.getParentId()); List sieveModels = sieveService.queryList(sieveQuery); - if (CollectionUtils.isNotEmpty(sieveModels)) - { + if (CollectionUtils.isNotEmpty(sieveModels)) { SieveModel sieveModel = sieveModels.get(0); sieveModel.setReviceStatus(1); sieveModel.setSieveHospitalId(sieveApplyOrderAddRequestHuada.getSieveHospitalId()); @@ -1467,7 +1469,7 @@ public class ApplyOrderFacade { } - public boolean huadaSaveSampleInfo(Object o){ + public boolean huadaSaveSampleInfo(Object o) { try { ArrayList paramsList = new ArrayList(); AllParamsRequest paramsRequest = new AllParamsRequest(); @@ -1484,12 +1486,12 @@ public class ApplyOrderFacade { timestamp = timestamp.replaceAll(" ", "%20");//空格替换成 %20 String syscode = signParams.get("syscode").toString(); String sign = signParams.get("sign").toString(); - String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&"+ "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map); + String s = HttpClientUtil.sendPost(HUADA_URL + "/intf?method=saveSampleInfo&" + "timestamp=" + timestamp + "&syscode=" + syscode + "&sign=" + sign, map); System.out.println(s); JSONObject jsonObject = JSONObject.parseObject(s); JSONObject rows = JSONObject.parseObject(jsonObject.get("rows").toString()); JSONArray jsonArray = JSONArray.parseArray(rows.get("successedList").toString()); - if (jsonArray.isEmpty()){ + if (jsonArray.isEmpty()) { return false; } return true; @@ -1501,23 +1503,26 @@ public class ApplyOrderFacade { /** * 获取签名map + * * @param syscode 系统编码 * @param secret 系统秘钥 * @return */ - public static Map getSignParams(String syscode,String secret) { - Map signParams=new HashMap<>(); + public static Map getSignParams(String syscode, String secret) { + Map signParams = new HashMap<>(); signParams.put("syscode", syscode); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); signParams.put("timestamp", sdf.format(new Date())); - String unencryptedStr=getUnencryptedStr(signParams); - String sign2=MD5.getMD5(secret+unencryptedStr+secret);//获取数字签名 - System.out.println("sign2 "+sign2); + String unencryptedStr = getUnencryptedStr(signParams); + String sign2 = MD5.getMD5(secret + unencryptedStr + secret);//获取数字签名 + System.out.println("sign2 " + sign2); signParams.put("sign", sign2); return signParams; } + /** * 获取待加密字符串 + * * @param signParams * @return */ @@ -1543,11 +1548,12 @@ public class ApplyOrderFacade { System.out.println(jsonObject); return null; } + /*拼json使用*/ - class AllParamsRequest{ - private String productLine; - private String identifying; - private Object sampleInfo; + class AllParamsRequest { + private String productLine; + private String identifying; + private Object sampleInfo; public String getIdentifying() { return identifying;