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

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

@@ -275,7 +275,7 @@ public class PrenatalInspectorPreCardService extends BaseService {
                        }
                        //重新排序
                        if(rep.size()>0&&re.size()>0){
                        if(rep.size()>0){
                            for (int i=0;i<re.size();i++){
                                rep.add(re.getJSONObject(i));
                            }