Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -244,14 +244,14 @@ public class PrescriptionService extends BaseService {
                    List<PrescriptionDiagnosis> pds = prescriptionDiagnosisDao.findByPrescriptionCode(prescription.getCode());
                    //诊断明细        {"zdms00":"诊断或症状描述","zdbh00":"诊断或症状编码"}
                    if (!pds.isEmpty()){
                        JSONArray zdInfo = new JSONArray();
                        for (PrescriptionDiagnosis pd : pds) {
                            JSONArray zdInfo = new JSONArray();
                            JSONObject j1 = new JSONObject();
                            j1.put("zdms00",pd.getName());//诊断或症状描述"1型糖尿病性酮症"
                            j1.put("zdbh00",pd.getCode());//诊断或症状编码"E10.100"
                            zdInfo.add(j1);
                            json.put("zdlist",zdInfo);
                        }
                        json.put("zdlist",zdInfo);
                    }