代码修改

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prenatalInspector/PrenatalInspectorPreCardService.java

@@ -352,8 +352,8 @@ public class PrenatalInspectorPreCardService extends BaseService {
     * @param patientCode
     * @return
     */
    public String reExamRecode(String patientCode,String pregnancyNo){
        String re = "";
    public JSONArray reExamRecode(String patientCode,String pregnancyNo){
        JSONArray re = new JSONArray();
        try {
            SignFamily signFamily = signFamilyDao.findByPatient(patientCode);
            String hospital = null;
@@ -363,7 +363,15 @@ public class PrenatalInspectorPreCardService extends BaseService {
            Patient patient = patientDao.findByCode(patientCode);
            String response = jwMaternalChildService.getEhrMaternalReExamRecord(patient.getIdcard(),hospital,pregnancyNo);
            return response;
            JSONObject json = JSONObject.parseObject(response);
            JSONArray data = null;
            if(json.getInteger("status")==200){
                data = json.getJSONObject("data").getJSONArray("DATA");
            }
            if(data!=null&&data.size()>0){
                return data;
            }
            return re;
        }catch (Exception e){
            e.printStackTrace();
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prenatalInspector/PrenatalController.java

@@ -60,8 +60,8 @@ public class PrenatalController extends BaseController{
                                             @ApiParam(name = "patient", value = "居民code", defaultValue = "d9de442323324a759ac82857c4692184")
                                             @RequestParam(value = "patient", required = true) String patient){
        try {
            String response = preCardService.reExamRecode(patient,pregnancyNo);
            return response;
            JSONArray response = preCardService.reExamRecode(patient,pregnancyNo);
            return write(200, "查询成功！", "data", response);
        }catch (Exception e){
            error(e);
            return error(-1,"查询失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/prenatalInspector/PrenatalInspectorContoller.java

@@ -85,9 +85,8 @@ public class PrenatalInspectorContoller extends BaseController{
    public String getEhrMaternalReExamRecord(@ApiParam(name = "pregnancyNo", value = "产检号", defaultValue = "")
                                             @RequestParam(value = "pregnancyNo", required = true) String pregnancyNo){
        try {
            String response = preCardService.reExamRecode(getUID(),pregnancyNo);
//            String response = preCardService.reExamRecode("d9de442323324a759ac82857c4692184",pregnancyNo);
            return response;
            JSONArray response = preCardService.reExamRecode(getUID(),pregnancyNo);//-- d9de442323324a759ac82857c4692184
            return write(200, "查询成功！", "data", response);
        }catch (Exception e){
            error(e);
            return error(-1,"查询失败");