代码修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/JwPrescriptionService.java

@@ -164,45 +164,7 @@ public class JwPrescriptionService {
                            pre.put("hospital",recipe.getString("HEALTH_ORG_CODE"));
                        }
//                        pre.put("diagnoseCode",recipe.getString("DIAGNOSE_CODE"));//诊断代码
//                        pre.put("diagnoseName",recipe.getString("DIAGNOSE_NAME"));//诊断名称
//                        pre.put("diagnoseSubCode",recipe.getString("DIAGNOSE_SUB_CODE"));//次诊断编码
//                        pre.put("diagnoseSubName",recipe.getString("DIAGNOSE_SUB_NAME"));//次诊断名称
                        PrescriptionDiagnosis diagnosis = new PrescriptionDiagnosis();
                        String diagnoseCode = recipe.getString("DIAGNOSE_CODE");
                        String diagnoseName = recipe.getString("DIAGNOSE_NAME");
                        diagnosis.setCode(diagnoseCode);//诊断代码
                        diagnosis.setName(diagnoseName);//诊断名称
                        String icd10 = icd10DictServcie.getHealthProblemsByIcd10Code(diagnoseCode);
                        if(!StringUtils.isEmpty(icd10)){
                            JSONObject icd = JSONObject.parseObject(icd10);
                            diagnosis.setHealthProblemName(icd.getString("value"));//诊断名称
                            diagnosis.setHealthProblem(icd.getString("key"));//诊断代码
                        }else{
                            diagnosis.setHealthProblemName(diagnoseName);//诊断名称
                            diagnosis.setHealthProblem(diagnoseCode);//诊断代码
                        }
                        JSONArray jsonArrayDt = new JSONArray();
                        jsonArrayDt.add(diagnosis);
                        if(recipe.getString("DIAGNOSE_SUB_CODE")!=null){
                            diagnosis = new PrescriptionDiagnosis();
                            diagnoseCode = recipe.getString("DIAGNOSE_CODE");
                            diagnoseName = recipe.getString("DIAGNOSE_NAME");
                            diagnosis.setCode(diagnoseCode);//诊断代码
                            diagnosis.setName(diagnoseName);//诊断名称
                            icd10 = icd10DictServcie.getHealthProblemsByIcd10Code(diagnoseCode);
                            if(!StringUtils.isEmpty(icd10)){
                                JSONObject icd = JSONObject.parseObject(icd10);
                                diagnosis.setHealthProblemName(icd.getString("value"));//诊断名称
                                diagnosis.setHealthProblem(icd.getString("key"));//诊断代码
                            }else{
                                diagnosis.setHealthProblemName(diagnoseName);//诊断名称
                                diagnosis.setHealthProblem(diagnoseCode);//诊断代码
                            }
                            jsonArrayDt.add(diagnosis);
                        }
                        pre.put("prescriptionDt",jsonArrayDt);
                        pre.put("prescriptionDt",getDiagnosis(recipe));
                        jsonArray.add(pre);
                    }
                }
@@ -215,6 +177,48 @@ public class JwPrescriptionService {
        return re;
    }
    /**
     * 诊断类型转换
     * @param recipe
     * @return
     */
    private JSONArray getDiagnosis(JSONObject recipe){
        JSONArray jsonArrayDt = new JSONArray();
        PrescriptionDiagnosis diagnosis = new PrescriptionDiagnosis();
        String diagnoseCode = recipe.getString("DIAGNOSE_CODE");//诊断代码
        String diagnoseName = recipe.getString("DIAGNOSE_NAME");//诊断名称
        diagnosis.setCode(diagnoseCode);//诊断代码
        diagnosis.setName(diagnoseName);//诊断名称
        String icd10 = icd10DictServcie.getHealthProblemsByIcd10Code(diagnoseCode);
        if(!StringUtils.isEmpty(icd10)){
            JSONObject icd = JSONObject.parseObject(icd10);
            diagnosis.setHealthProblemName(icd.getString("value"));//诊断名称
            diagnosis.setHealthProblem(icd.getString("key"));//诊断代码
        }else{
            diagnosis.setHealthProblemName(diagnoseName);//诊断名称
            diagnosis.setHealthProblem(diagnoseCode);//诊断代码
        }
        jsonArrayDt.add(diagnosis);
        if(recipe.getString("DIAGNOSE_SUB_CODE")!=null){
            diagnosis = new PrescriptionDiagnosis();
            diagnoseCode = recipe.getString("DIAGNOSE_SUB_CODE");
            diagnoseName = recipe.getString("DIAGNOSE_SUB_NAME");
            diagnosis.setCode(diagnoseCode);//次诊断代码
            diagnosis.setName(diagnoseName);//次诊断名称
            icd10 = icd10DictServcie.getHealthProblemsByIcd10Code(diagnoseCode);
            if(!StringUtils.isEmpty(icd10)){
                JSONObject icd = JSONObject.parseObject(icd10);
                diagnosis.setHealthProblemName(icd.getString("value"));//次诊断名称
                diagnosis.setHealthProblem(icd.getString("key"));//次诊断代码
            }else{
                diagnosis.setHealthProblemName(diagnoseName);//次诊断名称
                diagnosis.setHealthProblem(diagnoseCode);//次诊断代码
            }
            jsonArrayDt.add(diagnosis);
        }
        return jsonArrayDt;
    }
    /**
     * 获取单条历史处方
     * @param recipeNo