Merge remote-tracking branch 'origin/master'

zhaowenxuan

2024-12-31 22bae14654273016ad3bd111a6e7189af50618ba

Merge remote-tracking branch 'origin/master'

 src/main/java/com/example/service/shanxiqin/xian/MeiJiHisService.java

@@ -149,9 +149,10 @@
        Object returnData = entries.get("returnData");
        if (null != returnData && !returnData.toString().equals("null")) {
            HashMap<String, String> hashMap = new HashMap<>();
            JSONObject data = entries.getJSONObject("returnData");
            hashMap.put(ApiParamsConstants.CARD_ID,data.getStr("jiuZhenKh"));
            hashMap.put(ApiParamsConstants.PATIONID,data.getStr("bingRenId"));
            JSONArray returnData1 = entries.getJSONArray("returnData");
            JSONObject jsonObject = (JSONObject) returnData1.get(0);
            hashMap.put(ApiParamsConstants.CARD_ID,jsonObject.getStr("jiuZhenKh"));
            hashMap.put(ApiParamsConstants.PATIONID,jsonObject.getStr("bingRenId"));
            object.putOpt("code",200);
            object.putOpt("data",hashMap);
            return JSONUtil.toJsonStr(object);
@@ -168,14 +169,15 @@
        map.put ("kaiLeiXing","4");
        map.put("jiuZhenKh",params.get(ApiParamsConstants.CARD_ID));
        map.put ("xingMing", params.get(ApiParamsConstants.CUS_NAME));
        long cusSex = Long.parseLong(params.get(ApiParamsConstants.CUS_SEX).toString());
        if(cusSex==0L){
            map.put ("xingBie","男");
        }else if(cusSex==1L){
            map.put ("xingBie","女");
        }else {
            map.put ("xingBie","未知");
        Long cusSex = Long.parseLong(params.get(ApiParamsConstants.CUS_SEX).toString());
        if (cusSex == 0L) {
            map.put("xingBie", "男");
        } else if (cusSex == 1L) {
            map.put("xingBie", "女");
        } else {
            map.put("xingBie", "未知");
        }

        map.put ("shenFenZh", params.get(ApiParamsConstants.CUS_ID_CARD));
        map.put ("danWeiBh","");
        map.put ("chuShengRq", params.get(ApiParamsConstants.CUS_BRITHDAY));